incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r911029 [3/19] - in /incubator/lcf/trunk: modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/ modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/ modules/connectors/documentum/crawler...
Date Wed, 17 Feb 2010 15:57:35 GMT
Modified: incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnectionFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnectionFactory.java (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnectionFactory.java Wed Feb 17 15:57:27 2010
@@ -21,7 +21,7 @@
 import org.apache.lcf.core.interfaces.*;
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.crawler.system.Logging;
-import org.apache.lcf.crawler.system.Metacarta;
+import org.apache.lcf.crawler.system.LCF;
 
 import java.util.*;
 import java.sql.*;
@@ -66,14 +66,14 @@
 
 
 	public static Connection getConnection(String providerName, String host, String database, String userName, String password)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (database.length() == 0)
 			database = "_root_";
 
 		String driverClassName = (String)driverMap.get(providerName);
 		if (driverClassName == null)
-			throw new MetacartaException("Unrecognized jdbc provider: '"+providerName+"'");
+			throw new LCFException("Unrecognized jdbc provider: '"+providerName+"'");
 
 		String instanceName = null;
 		// Special for MSSQL: Allow database spec to contain an instance name too, in form:
@@ -111,7 +111,7 @@
 				// Better include the credentials on the pool key, or we won't be able to change those and have it build new connections
 				// The password value is SHA-1 hashed, because the pool driver reports the password in many exceptions and we don't want it
 				// to be displayed.
-				poolKey += "/" + userName + "/" + Metacarta.hash(password);
+				poolKey += "/" + userName + "/" + LCF.hash(password);
 				
 				synchronized (_pool)
 				{
@@ -134,7 +134,7 @@
 					ConnectionPoolManager.URL_PREFIX + poolKey, null, null);
 			}
 			else
-				throw new MetacartaException("Can't get connection since pool driver did not initialize properly");
+				throw new LCFException("Can't get connection since pool driver did not initialize properly");
 		}
 		catch (java.sql.SQLException e)
 		{
@@ -153,7 +153,7 @@
 			}
 			catch (java.sql.SQLException e2)
 			{
-				throw new MetacartaException("Error getting connection: "+e2.getMessage(),e2,MetacartaException.SETUP_ERROR);
+				throw new LCFException("Error getting connection: "+e2.getMessage(),e2,LCFException.SETUP_ERROR);
 			}
                         // By definition, this must be a service interruption, because the direct route in setting up the connection succeeded.
                         long currentTime = System.currentTimeMillis();
@@ -161,20 +161,20 @@
 		}
 		catch (java.lang.ClassNotFoundException e)
 		{
-			throw new MetacartaException("Driver class not found: "+e.getMessage(),e,MetacartaException.SETUP_ERROR);
+			throw new LCFException("Driver class not found: "+e.getMessage(),e,LCFException.SETUP_ERROR);
 		}
 		catch (java.lang.InstantiationException e)
 		{
-			throw new MetacartaException("Driver class not instantiable: "+e.getMessage(),e,MetacartaException.SETUP_ERROR);
+			throw new LCFException("Driver class not instantiable: "+e.getMessage(),e,LCFException.SETUP_ERROR);
 		}
 		catch (java.lang.IllegalAccessException e)
 		{
-			throw new MetacartaException("Driver class not accessible: "+e.getMessage(),e,MetacartaException.SETUP_ERROR);
+			throw new LCFException("Driver class not accessible: "+e.getMessage(),e,LCFException.SETUP_ERROR);
 		}
 	}
 
 	public static void releaseConnection(Connection c)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -182,7 +182,7 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Error releasing connection: "+e.getMessage(),e);
+			throw new LCFException("Error releasing connection: "+e.getMessage(),e);
 		}
 	}
 

Modified: incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java Wed Feb 17 15:57:27 2010
@@ -31,7 +31,7 @@
 import java.io.*;
 import java.util.*;
 
-/** This interface describes an instance of a connection between a repository and Metacarta's
+/** This interface describes an instance of a connection between a repository and LCF's
 * standard "pull" ingestion agent.
 *
 * Each instance of this interface is used in only one thread at a time.  Connection Pooling
@@ -90,14 +90,14 @@
 
 	/** Set up a session */
 	protected void getSession()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (connection == null)
 		{
 			if (jdbcProvider == null || jdbcProvider.length() == 0)
-				throw new MetacartaException("Missing parameter '"+JDBCConstants.providerParameter+"'");
+				throw new LCFException("Missing parameter '"+JDBCConstants.providerParameter+"'");
 			if (host == null || host.length() == 0)
-				throw new MetacartaException("Missing parameter '"+JDBCConstants.hostParameter+"'");
+				throw new LCFException("Missing parameter '"+JDBCConstants.hostParameter+"'");
 
 			connection = new JDBCConnection(jdbcProvider,host,databaseName,userName,password);
 		}
@@ -149,7 +149,7 @@
 	/** Check status of connection.
 	*/
 	public String check()
-		throws MetacartaException
+		throws LCFException
 	{
                 try
                 {
@@ -169,7 +169,7 @@
 	/** Close the connection.  Call this before discarding the repository connector.
 	*/
 	public void disconnect()
-		throws MetacartaException
+		throws LCFException
 	{
 		connection = null;
 		host = null;
@@ -223,7 +223,7 @@
 	*/
 	public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
 		long startTime, long endTime, int jobMode)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
         {
                 getSession();
             
@@ -255,7 +255,7 @@
                                 createQueryString(queryText,paramList), "ERROR", e.getMessage(), null);
                         throw e;
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         // If failure, record the failure.
                         activities.recordActivity(new Long(startQueryTime), ACTIVITY_EXTERNAL_QUERY, null,
@@ -276,7 +276,7 @@
                                         break;
                                 Object o = row.getValue(JDBCConstants.idReturnColumnName);
                                 if (o == null)
-                                        throw new MetacartaException("Bad seed query; doesn't return 'id' column.  Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
+                                        throw new LCFException("Bad seed query; doesn't return 'id' column.  Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
                                 String idValue = o.toString();
                                 activities.addSeedDocument(idValue);
                         }
@@ -306,7 +306,7 @@
 	*/
 	public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
 		DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		getSession();
 		TableSpec ts = new TableSpec(spec);
@@ -363,7 +363,7 @@
 		{
 			result = connection.executeUncachedQuery(queryText,paramList,-1);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			// If failure, record the failure.
 			activities.recordActivity(new Long(startTime), ACTIVITY_EXTERNAL_QUERY, null,
@@ -383,7 +383,7 @@
 					break;
 				Object o = row.getValue(JDBCConstants.idReturnColumnName);
 				if (o == null)
-					throw new MetacartaException("Bad version query; doesn't return 'id' column.  Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
+					throw new LCFException("Bad version query; doesn't return 'id' column.  Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
 				String idValue = o.toString();
 				o = row.getValue(JDBCConstants.versionReturnColumnName);
 				String versionValue;
@@ -432,7 +432,7 @@
 	* should only find other references, and should not actually call the ingestion methods.
 	*/
 	public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		getSession();
 		TableSpec ts = new TableSpec(spec);
@@ -476,7 +476,7 @@
 		{
 			result = connection.executeUncachedQuery(queryText,paramList,-1);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			// If failure, record the failure.
 			activities.recordActivity(new Long(startTime), ACTIVITY_EXTERNAL_QUERY, null,
@@ -496,7 +496,7 @@
 				break;
 			Object o = row.getValue(JDBCConstants.idReturnColumnName);
 			if (o == null)
-			    throw new MetacartaException("Bad document query; doesn't return 'id' column.  Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
+			    throw new LCFException("Bad document query; doesn't return 'id' column.  Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
 			String id = readAsString(o);
 			String version = (String)map.get(id);
 			if (version != null)
@@ -598,15 +598,15 @@
 					}
 					catch (java.net.SocketTimeoutException e)
 					{
-						throw new MetacartaException("Socket timeout reading database data: "+e.getMessage(),e);
+						throw new LCFException("Socket timeout reading database data: "+e.getMessage(),e);
 					}
 					catch (InterruptedIOException e)
 					{
-						throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 					}
 					catch (IOException e)
 					{
-						throw new MetacartaException("Error reading database data: "+e.getMessage(),e);
+						throw new LCFException("Error reading database data: "+e.getMessage(),e);
 					}
 					finally
 					{
@@ -635,11 +635,11 @@
 					}
 					catch (InterruptedIOException e)
 					{
-						throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 					}
 					catch (IOException e)
 					{
-						throw new MetacartaException("Error reading database data: "+e.getMessage(),e);
+						throw new LCFException("Error reading database data: "+e.getMessage(),e);
 					}
 				    }
 				  }
@@ -744,7 +744,7 @@
 	* Each variable substitutes the string, and it also substitutes zero or more query parameters.
 	*/
 	protected static void substituteQuery(String inputString, VariableMap inputMap, StringBuffer outputQuery, ArrayList outputParams)
-		throws MetacartaException
+		throws LCFException
 	{
 		// We are looking for strings that look like this: $(something)
 		// Right at the moment we don't care even about quotes, so we just want to look for $(.
@@ -766,7 +766,7 @@
 			String variableName = inputString.substring(nextIndex+2,endIndex);
 			VariableMapItem item = inputMap.getVariable(variableName);
 			if (item == null)
-				throw new MetacartaException("No such substitution variable: $("+variableName+")");
+				throw new LCFException("No such substitution variable: $("+variableName+")");
 			outputQuery.append(inputString.substring(startIndex,nextIndex));
 			outputQuery.append(item.getValue());
 			ArrayList inputParams = item.getParameters();
@@ -961,7 +961,7 @@
 	
 	/** Make sure we read this field as a string */
 	protected static String readAsString(Object o)
-	    throws MetacartaException
+	    throws LCFException
 	{
 		if (o instanceof BinaryInput)
 		{
@@ -990,7 +990,7 @@
 			}
 			catch (IOException e)
 			{
-				throw new MetacartaException(e.getMessage(),e);
+				throw new LCFException(e.getMessage(),e);
 			}
 			finally
 			{

Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/GetConnectionInfo.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/GetConnectionInfo.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/GetConnectionInfo.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.crawler.interfaces.*;
 import org.apache.lcf.crawler.system.Logging;
-import org.apache.lcf.crawler.system.Metacarta;
+import org.apache.lcf.crawler.system.LCF;
 
 
 /** Get a livelink connection's information in printed form.
@@ -50,15 +50,15 @@
 		
 		try
 		{
-		        Metacarta.initializeEnvironment();
+		        LCF.initializeEnvironment();
 			IThreadContext tc = ThreadContextFactory.make();
 			IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
 			IRepositoryConnection connection = connectionManager.load(connectionName);
 			if (connection == null)
-				throw new MetacartaException("Connection "+connectionName+" does not exist");
+				throw new LCFException("Connection "+connectionName+" does not exist");
 			
 			if (connection.getClassName() == null || !connection.getClassName().equals("org.apache.lcf.crawler.connectors.livelink.LivelinkConnector"))
-				throw new MetacartaException("Command can only be used on working Livelink connections.");
+				throw new LCFException("Command can only be used on working Livelink connections.");
 
 			ConfigParams cfg = connection.getConfigParams();
 			

Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.authorities.interfaces.*;
 import org.apache.lcf.authorities.system.Logging;
-import org.apache.lcf.authorities.system.Metacarta;
+import org.apache.lcf.authorities.system.LCF;
 
 import java.io.*;
 import java.util.*;
@@ -135,7 +135,7 @@
 	}
 	
 	protected void attemptToConnect()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (LLUsers == null)
 		{
@@ -174,7 +174,7 @@
 	/** Check connection for sanity.
 	*/
 	public String check()
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -203,7 +203,7 @@
 		{
 			return "Temporary service interruption: "+e.getMessage();
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			return "Connection failed: "+e.getMessage();
 		}
@@ -212,7 +212,7 @@
 	/** Close the connection.  Call this before discarding the repository connector.
 	*/
 	public void disconnect()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (llServer != null)
 		{
@@ -235,7 +235,7 @@
 	* (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
 	*/
 	public AuthorizationResponse getAuthorizationResponse(String userName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// First, do what's necessary to map the user name that comes in to a reasonable
 		// Livelink domain\\user combination.
@@ -397,7 +397,7 @@
 	*@param e is the RuntimeException caught
 	*/
 	protected int handleLivelinkRuntimeException(RuntimeException e, int sanityRetryCount)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (
 			e instanceof com.opentext.api.LLHTTPAccessDeniedException ||
@@ -411,7 +411,7 @@
 		   )
 		{
 			String details = llServer.getErrors();
-			throw new MetacartaException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,MetacartaException.REPOSITORY_CONNECTION_ERROR);
+			throw new LCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,LCFException.REPOSITORY_CONNECTION_ERROR);
 		}
 		else if (
 			e instanceof com.opentext.api.LLBadServerCertificateException ||
@@ -425,14 +425,14 @@
 			  )
 		{
 			String details = llServer.getErrors();
-			throw new MetacartaException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
+			throw new LCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
 		}
 		else if (e instanceof com.opentext.api.LLIllegalOperationException)
 		{
 			// This usually means that LAPI has had a minor communication difficulty but hasn't reported it accurately.
 			// We *could* throw a ServiceInterruption, but OpenText recommends to just retry almost immediately.
 			String details = llServer.getErrors();
-			return assessRetry(sanityRetryCount,new MetacartaException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
+			return assessRetry(sanityRetryCount,new LCFException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
 		}
 		else if (e instanceof com.opentext.api.LLIOException)
 		{
@@ -444,7 +444,7 @@
 			}
 			catch (UnknownHostException e2)
 			{
-				throw new MetacartaException("Server name '"+serverName+"' cannot be resolved",e2);
+				throw new LCFException("Server name '"+serverName+"' cannot be resolved",e2);
 			}
 
 			throw new ServiceInterruption("Transient error: "+e.getMessage(),e,System.currentTimeMillis()+5*60000L,System.currentTimeMillis()+12*60*60000L,-1,true);
@@ -455,8 +455,8 @@
 	
 	/** Do a retry, or throw an exception if the retry count has been exhausted
 	*/
-	protected static int assessRetry(int sanityRetryCount, MetacartaException e)
-		throws MetacartaException
+	protected static int assessRetry(int sanityRetryCount, LCFException e)
+		throws LCFException
 	{
 		if (sanityRetryCount == 0)
 		{
@@ -467,11 +467,11 @@
 
 		try
 		{
-			Metacarta.sleep(1000L);
+			LCF.sleep(1000L);
 		}
 		catch (InterruptedException e2)
 		{
-			throw new MetacartaException(e2.getMessage(),e2,MetacartaException.INTERRUPTED);
+			throw new LCFException(e2.getMessage(),e2,LCFException.INTERRUPTED);
 		}
 		// Exit the method
 		return sanityRetryCount;

Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.crawler.interfaces.*;
 import org.apache.lcf.crawler.system.Logging;
-import org.apache.lcf.crawler.system.Metacarta;
+import org.apache.lcf.crawler.system.LCF;
 
 import java.io.*;
 import java.util.*;
@@ -207,7 +207,7 @@
 					LLENTWK_VOL = entinfo.toInteger("VolumeID");
 				}
 				else
-					throw new MetacartaException("Error accessing enterprise workspace: "+status);
+					throw new LCFException("Error accessing enterprise workspace: "+status);
 
 				entinfo = new LLValue().setAssoc();
 				status = LLDocs.AccessCategoryWS(entinfo);
@@ -217,7 +217,7 @@
 					LLCATWK_VOL = entinfo.toInteger("VolumeID");
 				}
 				else
-					throw new MetacartaException("Error accessing category workspace: "+status);
+					throw new LCFException("Error accessing category workspace: "+status);
 			}
 			catch (Throwable e)
 			{
@@ -247,7 +247,7 @@
 	}
 	
 	protected void getSession()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (hasBeenSetup == false)
 		{
@@ -303,7 +303,7 @@
 			}
 			catch (NumberFormatException e)
 			{
-				throw new MetacartaException("Bad ingest port: "+e.getMessage(),e);
+				throw new LCFException("Bad ingest port: "+e.getMessage(),e);
 			}
 			
 			String viewPortString;
@@ -324,7 +324,7 @@
 			}
 			catch (NumberFormatException e)
 			{
-				throw new MetacartaException("Bad view port: "+e.getMessage(),e);
+				throw new LCFException("Bad view port: "+e.getMessage(),e);
 			}
 
 			if (viewCgiPath == null || viewCgiPath.length() == 0)
@@ -395,8 +395,8 @@
 					{
 						if (thr instanceof RuntimeException)
 							throw (RuntimeException)thr;
-						else if (thr instanceof MetacartaException)
-							throw (MetacartaException)thr;
+						else if (thr instanceof LCFException)
+							throw (LCFException)thr;
 						else
 							throw (Error)thr;
 					}
@@ -410,7 +410,7 @@
 				catch (InterruptedException e)
 				{
 					t.interrupt();
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				}
 				catch (RuntimeException e2)
 				{
@@ -495,7 +495,7 @@
 	/** Check status of connection.
 	*/
 	public String check()
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -538,7 +538,7 @@
 			    {
 				// Drop the connection on the floor
 				method = null;
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			    }
 			    catch (java.net.SocketTimeoutException e)
 			    {
@@ -558,7 +558,7 @@
 			    }
 			    catch (InterruptedIOException e)
 			    {
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			    }
 			    catch (IOException e)
 			    {
@@ -579,9 +579,9 @@
 		{
 			return "Transient error: "+e.getMessage();
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
-			if (e.getErrorCode() == MetacartaException.INTERRUPTED)
+			if (e.getErrorCode() == LCFException.INTERRUPTED)
 				throw e;
 			return "Error: "+e.getMessage();
 		}
@@ -591,7 +591,7 @@
 	* in active use.
 	*/
 	public void poll()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (connectionManager != null)
 			connectionManager.closeIdleConnections(60000L);
@@ -600,7 +600,7 @@
 	/** Close the connection.  Call this before discarding the repository connector.
 	*/
 	public void disconnect()
-		throws MetacartaException
+		throws LCFException
 	{
 		llServer.disconnect();
 		hasBeenSetup = false;
@@ -653,7 +653,7 @@
 	*@return the relative document uri.
 	*/
 	protected String convertToIngestURI(String documentIdentifier)
-		throws MetacartaException
+		throws LCFException
 	{
 		// The document identifier is the string form of the object ID for this connector.
 		if (!documentIdentifier.startsWith("D"))
@@ -672,7 +672,7 @@
 	*@return the document uri.
 	*/
 	protected String convertToViewURI(String documentIdentifier)
-		throws MetacartaException
+		throws LCFException
 	{
 		// The document identifier is the string form of the object ID for this connector.
 		if (!documentIdentifier.startsWith("D"))
@@ -689,7 +689,7 @@
 	*@return the object id, or -1 if documentIdentifier does not describe a document.
 	*/
 	protected static int convertToObjectID(String documentIdentifier)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (!documentIdentifier.startsWith("D"))
 			return -1;
@@ -703,7 +703,7 @@
 		}
 		catch (NumberFormatException e)
 		{
-			throw new MetacartaException("Bad document identifier: "+e.getMessage(),e);
+			throw new LCFException("Bad document identifier: "+e.getMessage(),e);
 		}
 	}
 
@@ -717,7 +717,7 @@
 	*/
 	public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
 		long startTime, long endTime)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		getSession();
 
@@ -727,7 +727,7 @@
 		{
 			// If we get here, it HAS to be a bad network/transient problem.
 			Logging.connectors.warn("Livelink: Could not look up root workspace object during seeding!  Retrying -");
-			throw new ServiceInterruption("Service interruption during seeding",new MetacartaException("Could not looking root workspace object during seeding"),System.currentTimeMillis()+60000L,
+			throw new ServiceInterruption("Service interruption during seeding",new LCFException("Could not looking root workspace object during seeding"),System.currentTimeMillis()+60000L,
 				System.currentTimeMillis()+600000L,-1,true);
 		}
 
@@ -784,7 +784,7 @@
 	*/
 	public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
 		DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		getSession();
 		
@@ -1080,7 +1080,7 @@
 				int status = LLDocs.ListObjects(vol, objID, null, filterString, LAPI_DOCUMENTS.PERM_SEECONTENTS, childrenDocs);
 				if (status != 0)
 				{
-					throw new MetacartaException("Error retrieving contents of folder "+Integer.toString(vol)+":"+Integer.toString(objID)+" : Status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
+					throw new LCFException("Error retrieving contents of folder "+Integer.toString(vol)+":"+Integer.toString(objID)+" : Status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
 				}
 				rval = childrenDocs;
 			}
@@ -1113,7 +1113,7 @@
 	* should only find other references, and should not actually call the ingestion methods.
 	*/
 	public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		getSession();
 		
@@ -1168,9 +1168,9 @@
 				    {
 					if (thr instanceof RuntimeException)
 						throw (RuntimeException)thr;
-					else if (thr instanceof MetacartaException)
+					else if (thr instanceof LCFException)
 					{
-						sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+						sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 						continue;
 					}
 					else
@@ -1238,7 +1238,7 @@
 				  catch (InterruptedException e)
 				  {
 					t.interrupt();
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				  }
 				  catch (RuntimeException e)
 				  {
@@ -1304,7 +1304,7 @@
 	*@return a list of workspace names.
 	*/
 	public String[] getWorkspaceNames()
-		throws MetacartaException
+		throws LCFException
 	{
 		return new String[]{CATEGORY_NAME,ENTWKSPACE_NAME};
 	}
@@ -1314,7 +1314,7 @@
 	*@return a list of folder and project names, in sorted order, or null if the path was invalid.
 	*/
 	public String[] getChildFolderNames(String pathString)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -1323,7 +1323,7 @@
 		}
 		catch (ServiceInterruption e)
 		{
-			throw new MetacartaException("Livelink server seems to be down: "+e.getMessage());
+			throw new LCFException("Livelink server seems to be down: "+e.getMessage());
 		}
 	}
 
@@ -1333,7 +1333,7 @@
 	*@return a list of category names, in sorted order, or null if the path was invalid.
 	*/
 	public String[] getChildCategoryNames(String pathString)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -1341,7 +1341,7 @@
 		}
 		catch (ServiceInterruption e)
 		{
-			throw new MetacartaException("Livelink server seems to be down: "+e.getMessage());
+			throw new LCFException("Livelink server seems to be down: "+e.getMessage());
 		}
 	}
 
@@ -1350,7 +1350,7 @@
 	*@return a list of attribute names, in sorted order, or null of the path was invalid.
 	*/
 	public String[] getCategoryAttributes(String pathString)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		getSession();
 
@@ -1374,7 +1374,7 @@
 	/** Create the login URI.  This must be a relative URI.
 	*/
 	protected String createLivelinkLoginURI()
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -1392,7 +1392,7 @@
 	    }
 	    catch (UnsupportedEncodingException e)
 	    {
-		throw new MetacartaException("Login URI setup error: "+e.getMessage(),e);
+		throw new LCFException("Login URI setup error: "+e.getMessage(),e);
 	    }
 	}
 	
@@ -1462,7 +1462,7 @@
 	protected void ingestFromLiveLink(String documentIdentifier, String version,
 		IProcessActivity activities,
 		MetadataDescription desc, SystemMetadataDescription sDesc)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 
 		String contextMsg = "for '"+documentIdentifier+"'";
@@ -1595,7 +1595,7 @@
 			case 500:
 			case 502:
 			    Logging.connectors.warn("Livelink: Service interruption during fetch "+contextMsg+" with Livelink HTTP Server, retrying...");
-			    throw new ServiceInterruption("Service interruption during fetch",new MetacartaException(Integer.toString(statusCode)+" error while fetching"),System.currentTimeMillis()+60000L,
+			    throw new ServiceInterruption("Service interruption during fetch",new LCFException(Integer.toString(statusCode)+" error while fetching"),System.currentTimeMillis()+60000L,
 				System.currentTimeMillis()+600000L,-1,true);
 
 		        case HttpStatus.SC_UNAUTHORIZED:
@@ -1670,11 +1670,11 @@
 				    }
 				    catch (InterruptedException e)
 				    {
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				    }
 				    catch (InterruptedIOException e)
 				    {
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				    }
 				    catch (IOException e)
 				    {
@@ -1696,12 +1696,12 @@
 		        case HttpStatus.SC_USE_PROXY:
 		        case HttpStatus.SC_GONE:
 			    resultCode = "ERROR "+Integer.toString(statusCode);
-			    throw new MetacartaException("Unrecoverable request failure; error = "+Integer.toString(statusCode));
+			    throw new LCFException("Unrecoverable request failure; error = "+Integer.toString(statusCode));
 		        default:
 			    resultCode = "UNKNOWN";
 			    Logging.connectors.warn("Livelink: Attempt to retrieve document from '"+ingestHttpAddress+"' received a response of "+Integer.toString(statusCode)+"; retrying in one minute");
 			    currentTime = System.currentTimeMillis();
-			    throw new ServiceInterruption("Fetch failed; retrying in 1 minute",new MetacartaException("Fetch failed with unknown code "+Integer.toString(statusCode)),
+			    throw new ServiceInterruption("Fetch failed; retrying in 1 minute",new LCFException("Fetch failed with unknown code "+Integer.toString(statusCode)),
 				currentTime+60000L,currentTime+600000L,-1,true);
 		        }
 		    }
@@ -1709,7 +1709,7 @@
 		    {
 			// Drop the connection on the floor
 			method = null;
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		    }
 		    catch (java.net.SocketTimeoutException e)
 		    {
@@ -1745,13 +1745,13 @@
 		    }
 		    catch (InterruptedIOException e)
 		    {
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		    }
 		    catch (IOException e)
 		    {
 			resultCode = "EXCEPTION";
 			resultDescription = e.getMessage();
-			throw new MetacartaException("Exception getting response "+contextMsg+": "+e.getMessage(), e);
+			throw new LCFException("Exception getting response "+contextMsg+": "+e.getMessage(), e);
 		    }
 		    finally
 		    {
@@ -1765,7 +1765,7 @@
 		catch (IllegalStateException e)
 		{
 			Logging.connectors.error("Livelink: State exception dealing with '"+ingestHttpAddress+"': "+e.getMessage(),e);
-			throw new MetacartaException("State exception dealing with '"+ingestHttpAddress+"': "+e.getMessage(),e);
+			throw new LCFException("State exception dealing with '"+ingestHttpAddress+"': "+e.getMessage(),e);
 		}
 	}
 
@@ -1781,7 +1781,7 @@
 	
 	/** Initialize a livelink client connection */
 	protected HttpClient getInitializedClient(String contextMsg)
-		throws ServiceInterruption, MetacartaException
+		throws ServiceInterruption, LCFException
 	{
         	HttpClient client = new HttpClient(connectionManager);
 		client.getParams().setParameter(org.apache.commons.httpclient.params.HttpClientParams.PROTOCOL_FACTORY,myFactory);
@@ -1815,7 +1815,7 @@
 				{
 					Logging.connectors.warn("Livelink: Service interruption during authentication "+contextMsg+" with Livelink HTTP Server, retrying...");
 					currentTime = System.currentTimeMillis();
-					throw new ServiceInterruption("502 error during authentication",new MetacartaException("502 error while authenticating"),
+					throw new ServiceInterruption("502 error during authentication",new LCFException("502 error while authenticating"),
 						currentTime+60000L,currentTime+600000L,-1,true);
 				}
 				if (statusCode != HttpStatus.SC_OK)
@@ -1823,9 +1823,9 @@
 					Logging.connectors.error("Livelink: Failed to authenticate "+contextMsg+" against Livelink HTTP Server; Status code: " + statusCode);
 					// Ok, so we didn't get in - simply do not ingest
 					if (statusCode == HttpStatus.SC_UNAUTHORIZED)
-						throw new MetacartaException("Session authorization failed with a 401 code; are credentials correct?");
+						throw new LCFException("Session authorization failed with a 401 code; are credentials correct?");
 					else
-						throw new MetacartaException("Session authorization failed with code "+Integer.toString(statusCode));
+						throw new LCFException("Session authorization failed with code "+Integer.toString(statusCode));
 				}
 				if (Logging.connectors.isDebugEnabled())
 					Logging.connectors.debug("Livelink: Retrieving authentication response "+contextMsg+"");
@@ -1838,7 +1838,7 @@
 			{
 				// Drop the connection on the floor
 				authget = null;
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 			catch (java.net.SocketTimeoutException e)
 			{
@@ -1866,12 +1866,12 @@
 			}
 			catch (InterruptedIOException e)
 			{
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 			catch (IOException e)
 			{
         			Logging.connectors.error("Livelink: IO exception when authenticating to the Livelink HTTP Server "+contextMsg+": "+e.getMessage(), e);
-        			throw new MetacartaException("Unable to communicate with the Livelink HTTP Server: "+e.getMessage(), e);
+        			throw new LCFException("Unable to communicate with the Livelink HTTP Server: "+e.getMessage(), e);
         	
 			}
 			finally
@@ -1883,7 +1883,7 @@
 		catch (IllegalStateException e)
 		{
 			Logging.connectors.error("Livelink: State exception dealing with '"+createLivelinkLoginURI()+"'",e);
-			throw new MetacartaException("State exception dealing with login URI: "+e.getMessage(),e);
+			throw new LCFException("State exception dealing with login URI: "+e.getMessage(),e);
 		}
 
 		return client;
@@ -2018,7 +2018,7 @@
 	*@return a list of folder and project names, in sorted order, or null if the path was invalid.
 	*/
 	protected String[] getChildFolders(String pathString)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  RootValue rv = new RootValue(pathString);
 
@@ -2043,9 +2043,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2066,7 +2066,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2082,7 +2082,7 @@
 	*@return a list of category names, in sorted order, or null if the path was invalid.
 	*/
 	protected String[] getChildCategories(String pathString)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  // Start at root
 	  RootValue rv = new RootValue(pathString);
@@ -2108,9 +2108,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2131,7 +2131,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2169,14 +2169,14 @@
 					return;
 				if (status != 0)
 				{
-					throw new MetacartaException("Error getting category version: "+Integer.toString(status));
+					throw new LCFException("Error getting category version: "+Integer.toString(status));
 				}
 
 				LLValue children = new LLValue();
 				status = LLAttributes.AttrListNames(catVersion,null,children);
 				if (status != 0)
 				{
-					throw new MetacartaException("Error getting attribute names: "+Integer.toString(status));
+					throw new LCFException("Error getting attribute names: "+Integer.toString(status));
 				}
 				rval = children;
 			}
@@ -2203,7 +2203,7 @@
 	*@return a list of attribute names, in sorted order, or null of the path was invalid.
 	*/
 	protected String[] getCategoryAttributes(int catObjectID)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  int sanityRetryCount = FAILURE_RETRY_COUNT;
 	  while (true)
@@ -2218,9 +2218,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2246,7 +2246,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2296,7 +2296,7 @@
 
 				if (status != 0)
 				{
-					throw new MetacartaException("Error retrieving category version: "+Integer.toString(status)+": "+llServer.getErrors());
+					throw new LCFException("Error retrieving category version: "+Integer.toString(status)+": "+llServer.getErrors());
 				}
 
 				rval = rvalue;
@@ -2322,7 +2322,7 @@
 	/** Get a category version for document.
 	*/
 	protected LLValue getCatVersion(int objID, int catID)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  int sanityRetryCount = FAILURE_RETRY_COUNT;
 	  while (true)
@@ -2337,9 +2337,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2350,7 +2350,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (NullPointerException npe)
 	    {
@@ -2402,7 +2402,7 @@
 
 				if (status != 0)
 				{
-					throw new MetacartaException("Error retrieving attribute value: "+Integer.toString(status)+": "+llServer.getErrors());
+					throw new LCFException("Error retrieving attribute value: "+Integer.toString(status)+": "+llServer.getErrors());
 				}
 				rval = children;
 			}
@@ -2426,7 +2426,7 @@
 	/** Get an attribute value from a category version.
 	*/
 	protected String[] getAttributeValue(LLValue categoryVersion, String attributeName)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  int sanityRetryCount = FAILURE_RETRY_COUNT;
 	  while (true)
@@ -2441,9 +2441,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2467,7 +2467,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2504,7 +2504,7 @@
 
 				if (status != 0)
 				{
-					throw new MetacartaException("Error retrieving document rights: "+Integer.toString(status)+": "+llServer.getErrors());
+					throw new LCFException("Error retrieving document rights: "+Integer.toString(status)+": "+llServer.getErrors());
 				}
 
 				rval = childrenObjects;
@@ -2533,7 +2533,7 @@
 	*@return the array.
 	*/
 	protected int[] getObjectRights(int vol, int objID)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  int sanityRetryCount = FAILURE_RETRY_COUNT;
 	  while (true)
@@ -2548,9 +2548,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2603,7 +2603,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2651,7 +2651,7 @@
 					Logging.connectors.warn("Livelink: Interpreting LAPI error 103102 while fetching object "+Integer.toString(vol)+":"+Integer.toString(id)+" as a service interruption - retrying.");
 					long currentTime = System.currentTimeMillis();
 					throw new ServiceInterruption("Service interruption fetching object "+Integer.toString(vol)+":"+Integer.toString(id),
-						new MetacartaException("Could not read object "+Integer.toString(vol)+":"+Integer.toString(id)),currentTime+60000L,
+						new LCFException("Could not read object "+Integer.toString(vol)+":"+Integer.toString(id)),currentTime+60000L,
 						currentTime+600000L,-1,false);
 				}
 				
@@ -2665,7 +2665,7 @@
 
 				if (status != 0)
 				{
-					throw new MetacartaException("Error retrieving document object "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
+					throw new LCFException("Error retrieving document object "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
 				}
 				rval = objinfo;
 			}
@@ -2694,7 +2694,7 @@
 	* @return LLValue the LAPI value object, or null if object has been deleted (or doesn't exist)
 	*/
 	protected LLValue getObjectInfo(int vol, int id)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  int sanityRetryCount = FAILURE_RETRY_COUNT;
 	  while (true)
@@ -2711,9 +2711,9 @@
 				throw (RuntimeException)thr;
 			else if (thr instanceof ServiceInterruption)
 				throw (ServiceInterruption)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2724,7 +2724,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2736,7 +2736,7 @@
 
 	/** Build a set of actual acls given a set of rights */
 	protected String[] lookupTokens(int[] rights, int vol, int objID)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		String[] convertedAcls = new String[rights.length];
 
@@ -2807,7 +2807,7 @@
 	/** Get an object's standard path, given its ID.
 	*/
 	protected String getObjectPath(int id)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		int objectId = id;
 		String path = null;
@@ -2887,7 +2887,7 @@
 
 				if (status != 0)
 				{
-					throw new MetacartaException("Error retrieving document categories for "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
+					throw new LCFException("Error retrieving document categories for "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
 				}
 				rval = catIDList;
 			}
@@ -2914,7 +2914,7 @@
 	* @return an array of integers containing category identifiers, or null if the object is not found.
 	*/
 	protected int[] getObjectCategoryIDs(int vol, int id)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	  int sanityRetryCount = FAILURE_RETRY_COUNT;
 	  while (true)
@@ -2929,9 +2929,9 @@
 		{
 			if (thr instanceof RuntimeException)
 				throw (RuntimeException)thr;
-			else if (thr instanceof MetacartaException)
+			else if (thr instanceof LCFException)
 			{
-				sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+				sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 				continue;
 			}
 			else
@@ -2986,7 +2986,7 @@
 	    catch (InterruptedException e)
 	    {
 		t.interrupt();
-		throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+		throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 	    }
 	    catch (RuntimeException e)
 	    {
@@ -2999,7 +2999,7 @@
 	/** RootValue version of getPathId.
 	*/
 	protected VolumeAndId getPathId(RootValue rv)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		return getPathId(rv.getRootValue(),rv.getRemainderPath());
 	}
@@ -3010,7 +3010,7 @@
 	* @param startPath is the folder name (a string with dots as separators)
 	*/		
 	protected VolumeAndId getPathId(LLValue objInfo, String startPath)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// Grab the volume ID and starting object
 		int obj = objInfo.toInteger("ID");
@@ -3054,9 +3054,9 @@
 					{
 						if (thr instanceof RuntimeException)
 							throw (RuntimeException)thr;
-						else if (thr instanceof MetacartaException)
+						else if (thr instanceof LCFException)
 						{
-							sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+							sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 							continue;
 						}
 						else
@@ -3090,7 +3090,7 @@
 				catch (InterruptedException e)
 				{
 					t.interrupt();
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				}
 				catch (RuntimeException e)
 				{
@@ -3107,7 +3107,7 @@
 	/** Rootvalue version of getCategoryId.
 	*/
 	protected int getCategoryId(RootValue rv)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		return getCategoryId(rv.getRootValue(),rv.getRemainderPath());
 	}
@@ -3118,7 +3118,7 @@
 	* @param startPath is the folder name, ending in a category name (a string with slashes as separators)
 	*/		
 	protected int getCategoryId(LLValue objInfo, String startPath)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// Grab the volume ID and starting object
 		int obj = objInfo.toInteger("ID");
@@ -3171,9 +3171,9 @@
 					{
 						if (thr instanceof RuntimeException)
 							throw (RuntimeException)thr;
-						else if (thr instanceof MetacartaException)
+						else if (thr instanceof LCFException)
 						{
-							sanityRetryCount = assessRetry(sanityRetryCount,(MetacartaException)thr);
+							sanityRetryCount = assessRetry(sanityRetryCount,(LCFException)thr);
 							continue;
 						}
 						else
@@ -3207,7 +3207,7 @@
 				catch (InterruptedException e)
 				{
 					t.interrupt();
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				}
 				catch (RuntimeException e)
 				{
@@ -3316,7 +3316,7 @@
 	*@return true if it should be included.
 	*/
 	protected static boolean checkInclude(String filename, DocumentSpecification documentSpecification)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Scan includes to insure we match
 		int i = 0;
@@ -3360,7 +3360,7 @@
 	*@param documentSpecification is the specification.
 	*/
 	protected boolean checkIngest(int objID, DocumentSpecification documentSpecification)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Since the only exclusions at this point are not based on file contents, this is a no-op.
 		return true;
@@ -3555,7 +3555,7 @@
 
 		/** Constructor */
 		public SystemMetadataDescription(DocumentSpecification spec)
-			throws MetacartaException
+			throws LCFException
 		{
 			pathAttributeName = null;
 			int i = 0;
@@ -3584,7 +3584,7 @@
 		/** Given an identifier, get the translated string that goes into the metadata.
 		*/
 		public String getPathAttributeValue(String documentIdentifier)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			String path = getNodePathString(documentIdentifier);
 			if (path == null)
@@ -3595,7 +3595,7 @@
 		/** For a given node, get its path.
 		*/
 		public String getNodePathString(String documentIdentifier)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			if (Logging.connectors.isDebugEnabled())
 				Logging.connectors.debug("Looking up path for '"+documentIdentifier+"'");
@@ -3631,7 +3631,7 @@
 				}
 				catch (NumberFormatException e)
 				{
-					throw new MetacartaException("Bad document identifier: "+e.getMessage(),e);
+					throw new LCFException("Bad document identifier: "+e.getMessage(),e);
 				}
 
 				// Load the object
@@ -3687,7 +3687,7 @@
 		*@return an iterator over MetadataItem objects.
 		*/
 		public Iterator getItems(ArrayList metadataItems)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			// This is the map that will be iterated over for a return value.
 			// It gets built out of (hopefully cached) data from categoryMap.
@@ -3766,7 +3766,7 @@
 
 		/** Get a specified set of packed category paths with attribute names, given the category identifiers */
 		public String[] getCategoryPathsAttributeNames(int[] catIDs)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			HashMap set = new HashMap();
 			int i = 0;
@@ -3813,14 +3813,14 @@
 
 		/** Find a category path given a category ID */
 		protected String findPath(int catID)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			return getObjectPath(catID);
 		}
 
 		/** Find a set of attributes given a category ID */
 		protected String[] findAttributes(int catID)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			return getCategoryAttributes(catID);
 		}
@@ -3868,7 +3868,7 @@
 		*@return the root node.
 		*/
 		public LLValue getRootValue()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			if (rootValue == null)
 			{
@@ -3877,12 +3877,12 @@
 				else if (workspaceName.equals(ENTWKSPACE_NAME))
 					rootValue = getObjectInfo(LLENTWK_VOL,LLENTWK_ID);
 				else
-					throw new MetacartaException("Bad workspace name: "+workspaceName);
+					throw new LCFException("Bad workspace name: "+workspaceName);
 				if (rootValue == null)
 				{
 					Logging.connectors.warn("Livelink: Could not get workspace/volume ID!  Retrying...");
 					// This cannot mean a real failure; it MUST mean that we have had an intermittent communication hiccup.  So, pass it off as a service interruption.
-					throw new ServiceInterruption("Service interruption getting root value",new MetacartaException("Could not get workspace/volume id"),System.currentTimeMillis()+60000L,
+					throw new ServiceInterruption("Service interruption getting root value",new LCFException("Could not get workspace/volume id"),System.currentTimeMillis()+60000L,
 						System.currentTimeMillis()+600000L,-1,true);
 				}
 			}
@@ -4004,7 +4004,7 @@
 	*@param failIfTimeout is true if, for transient conditions, we want to signal failure if the timeout condition is acheived.
 	*/
 	protected int handleLivelinkRuntimeException(RuntimeException e, int sanityRetryCount, boolean failIfTimeout)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (
 			e instanceof com.opentext.api.LLHTTPAccessDeniedException ||
@@ -4018,7 +4018,7 @@
 		   )
 		{
 			String details = llServer.getErrors();
-			throw new MetacartaException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,MetacartaException.REPOSITORY_CONNECTION_ERROR);
+			throw new LCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,LCFException.REPOSITORY_CONNECTION_ERROR);
 		}
 		else if (
 			e instanceof com.opentext.api.LLBadServerCertificateException ||
@@ -4033,14 +4033,14 @@
 		{
 
 			String details = llServer.getErrors();
-			throw new MetacartaException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
+			throw new LCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
 		}
 		else if (e instanceof com.opentext.api.LLIllegalOperationException)
 		{
 			// This usually means that LAPI has had a minor communication difficulty but hasn't reported it accurately.
 			// We *could* throw a ServiceInterruption, but OpenText recommends to just retry almost immediately.
 			String details = llServer.getErrors();
-			return assessRetry(sanityRetryCount,new MetacartaException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
+			return assessRetry(sanityRetryCount,new LCFException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
 		}
 		else if (e instanceof com.opentext.api.LLIOException)
 		{
@@ -4054,7 +4054,7 @@
 			}
 			catch (UnknownHostException e2)
 			{
-				throw new MetacartaException("Server name '"+serverName+"' cannot be resolved",e2);
+				throw new LCFException("Server name '"+serverName+"' cannot be resolved",e2);
 			}
 			
 			long currentTime = System.currentTimeMillis();
@@ -4066,8 +4066,8 @@
 	
 	/** Do a retry, or throw an exception if the retry count has been exhausted
 	*/
-	protected static int assessRetry(int sanityRetryCount, MetacartaException e)
-		throws MetacartaException
+	protected static int assessRetry(int sanityRetryCount, LCFException e)
+		throws LCFException
 	{
 		if (sanityRetryCount == 0)
 		{
@@ -4078,11 +4078,11 @@
 
 		try
 		{
-			Metacarta.sleep(1000L);
+			LCF.sleep(1000L);
 		}
 		catch (InterruptedException e2)
 		{
-			throw new MetacartaException(e2.getMessage(),e2,MetacartaException.INTERRUPTED);
+			throw new LCFException(e2.getMessage(),e2,LCFException.INTERRUPTED);
 		}
 		// Exit the method
 		return sanityRetryCount;

Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/MatchMap.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/MatchMap.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/MatchMap.java Wed Feb 17 15:57:27 2010
@@ -261,7 +261,7 @@
 	/** Perform a translation.
 	*/
 	public String translate(String input)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Build pattern vector if not already there
 		if (matchPatterns == null)
@@ -278,7 +278,7 @@
 				catch (java.util.regex.PatternSyntaxException e)
 				{
 					matchPatterns = null;
-					throw new MetacartaException("For match expression '"+regexp+"', found pattern syntax error: "+e.getMessage(),e);
+					throw new LCFException("For match expression '"+regexp+"', found pattern syntax error: "+e.getMessage(),e);
 				}
 				i++;
 			}

Modified: incubator/lcf/trunk/modules/connectors/livelink/crawler-ui/connectors/livelink/editspec.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/crawler-ui/connectors/livelink/editspec.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/crawler-ui/connectors/livelink/editspec.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/crawler-ui/connectors/livelink/editspec.jsp Wed Feb 17 15:57:27 2010
@@ -114,7 +114,7 @@
 			pathSoFar = "";
 			childList = c.getChildFolderNames("");
 			if (childList == null)
-				throw new MetacartaException("Can't find any children for root folder");
+				throw new LCFException("Can't find any children for root folder");
 		}
 	    }
 	    finally
@@ -157,7 +157,7 @@
 <%
 	    }
 	  }
-	  catch (MetacartaException e)
+	  catch (LCFException e)
 	  {
 		e.printStackTrace();
 		out.println(org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage()));
@@ -525,11 +525,11 @@
 				categorySoFar = "";
 				childList = c.getChildFolderNames("");
 				if (childList == null)
-					throw new MetacartaException("Can't find any children for root folder");
+					throw new LCFException("Can't find any children for root folder");
 			}
 			categoryList = c.getChildCategoryNames(categorySoFar);
 			if (categoryList == null)
-				throw new MetacartaException("Can't find any categories for root folder folder");
+				throw new LCFException("Can't find any categories for root folder folder");
 		    }
 		}
 	    }
@@ -650,7 +650,7 @@
 		}
 	    }
 	  }
-	  catch (MetacartaException e)
+	  catch (LCFException e)
 	  {
 		e.printStackTrace();
 		out.println(org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage()));

Modified: incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/HttpPoster.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/HttpPoster.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/HttpPoster.java (original)
+++ incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/HttpPoster.java Wed Feb 17 15:57:27 2010
@@ -94,7 +94,7 @@
         {
                 secureSocketFactory = getSecureSocketFactory();
         }
-        catch (MetacartaException e)
+        catch (LCFException e)
         {
                 // If we can't create, print and fail
                 e.printStackTrace();
@@ -109,7 +109,7 @@
      */
     public HttpPoster(String protocol, String server, int port, String webappName, String updatePath, String removePath, String statusPath,
         String realm, String userID, String password)
-        throws MetacartaException
+        throws LCFException
     {
         this.host = server;
         this.port = port;
@@ -123,7 +123,7 @@
                 }
                 catch (java.io.UnsupportedEncodingException e)
                 {
-                        throw new MetacartaException("Couldn't convert to utf-8 bytes: "+e.getMessage(),e);
+                        throw new LCFException("Couldn't convert to utf-8 bytes: "+e.getMessage(),e);
                 }
                 this.realm = realm;
         }
@@ -138,16 +138,16 @@
         postRemoveAction = webappName + removePath;
         postStatusAction = webappName + statusPath;
         
-        String x = Metacarta.getProperty(Metacarta.ingestBufferSizeProperty);
+        String x = LCF.getProperty(LCF.ingestBufferSizeProperty);
         if (x != null && x.length() > 0)
                 buffersize = new Integer(x).intValue();
-        x = Metacarta.getProperty(Metacarta.ingestResponseRetryCount);
+        x = LCF.getProperty(LCF.ingestResponseRetryCount);
         if (x != null && x.length() > 0)
                 responseRetries = new Integer(x).intValue();
-        x = Metacarta.getProperty(Metacarta.ingestResponseRetryInterval);
+        x = LCF.getProperty(LCF.ingestResponseRetryInterval);
         if (x != null && x.length() > 0)
                 responseRetryWait = new Long(x).longValue();
-        x = Metacarta.getProperty(Metacarta.ingestRescheduleInterval);
+        x = LCF.getProperty(LCF.ingestRescheduleInterval);
         if (x != null && x.length() > 0)
                 interruptionRetryTime = new Long(x).longValue();
     }
@@ -157,11 +157,11 @@
      * @param documentURI is the document's uri.
      * @param document is the document structure to ingest.
      * @return true if the ingestion was successful, or false if the ingestion is illegal.
-     * @throws MetacartaException, ServiceInterruption
+     * @throws LCFException, ServiceInterruption
      */
     public boolean indexPost(String documentURI,
         RepositoryDocument document, IOutputAddActivity activities)
-        throws MetacartaException, ServiceInterruption
+        throws LCFException, ServiceInterruption
     {
         if (Logging.ingest.isDebugEnabled())
                 Logging.ingest.debug("indexPost(): '" + documentURI + "'");
@@ -192,8 +192,8 @@
                     {
                         if (thr instanceof ServiceInterruption)
                             throw (ServiceInterruption)thr;
-                        if (thr instanceof MetacartaException)
-                            throw (MetacartaException)thr;
+                        if (thr instanceof LCFException)
+                            throw (LCFException)thr;
                         if (thr instanceof IOException)
                             throw (IOException)thr;
                         if (thr instanceof RuntimeException)
@@ -206,7 +206,7 @@
 		catch (InterruptedException e)
 		{
                     t.interrupt();
-                    throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                    throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
                 }
             }
             catch (java.net.SocketTimeoutException ioe)
@@ -241,11 +241,11 @@
             // Sleep for a time, and retry
             try
             {
-                Metacarta.sleep(10000L);
+                LCF.sleep(10000L);
             }
             catch (InterruptedException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
             }
             ioErrorRetry--;
             
@@ -258,7 +258,7 @@
     /** Post a check request.
     */
     public void checkPost()
-        throws MetacartaException, ServiceInterruption
+        throws LCFException, ServiceInterruption
     {
         if (Logging.ingest.isDebugEnabled())
                 Logging.ingest.debug("checkPost()");
@@ -280,8 +280,8 @@
                     {
                         if (thr instanceof ServiceInterruption)
                             throw (ServiceInterruption)thr;
-                        if (thr instanceof MetacartaException)
-                            throw (MetacartaException)thr;
+                        if (thr instanceof LCFException)
+                            throw (LCFException)thr;
                         if (thr instanceof IOException)
                             throw (IOException)thr;
                         if (thr instanceof RuntimeException)
@@ -294,7 +294,7 @@
 		catch (InterruptedException e)
 		{
                     t.interrupt();
-                    throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                    throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
                 }
             }
             catch (IOException ioe)
@@ -315,11 +315,11 @@
             // Sleep for a time, and retry
             try
             {
-                Metacarta.sleep(10000L);
+                LCF.sleep(10000L);
             }
             catch (InterruptedException e)
             {
-                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
             }
             ioErrorRetry--;
               
@@ -331,7 +331,7 @@
     *@param documentURI is the document's URI.
     */
     public void deletePost(String documentURI, IOutputRemoveActivity activities)
-        throws MetacartaException, ServiceInterruption
+        throws LCFException, ServiceInterruption
     {
         if (Logging.ingest.isDebugEnabled())
                 Logging.ingest.debug("deletePost(): '" + documentURI + "'");
@@ -356,8 +356,8 @@
                     {
                         if (thr instanceof ServiceInterruption)
                             throw (ServiceInterruption)thr;
-                        if (thr instanceof MetacartaException)
-                            throw (MetacartaException)thr;
+                        if (thr instanceof LCFException)
+                            throw (LCFException)thr;
                         if (thr instanceof IOException)
                             throw (IOException)thr;
                         if (thr instanceof RuntimeException)
@@ -370,7 +370,7 @@
 		catch (InterruptedException e)
 		{
                     t.interrupt();
-                    throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                    throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
                 }
             }
             catch (IOException ioe)
@@ -392,11 +392,11 @@
             // Sleep for a time, and retry
             try
             {
-                Metacarta.sleep(10000L);
+                LCF.sleep(10000L);
             }
             catch (InterruptedException e)
             {
-                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
             }
             
             ioErrorRetry--;
@@ -431,9 +431,9 @@
      * Get the response code of the post
      * @param stream the stream the response is going to come from
      * @return the response string
-     * @throws MetacartaException
+     * @throws LCFException
      */
-    protected CodeDetails getResponse(InputStream in) throws MetacartaException, ServiceInterruption
+    protected CodeDetails getResponse(InputStream in) throws LCFException, ServiceInterruption
     {
         Logging.ingest.debug("Waiting for response stream");
                         
@@ -478,7 +478,7 @@
                 {
                         doc = new XMLDoc(in);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         // Syntax errors should be eaten; we'll just return a null doc in that case.
                         e.printStackTrace();
@@ -500,7 +500,7 @@
         }
         catch (InterruptedIOException e)
         {
-                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
         }
         catch (java.net.ConnectException e)
         {
@@ -553,7 +553,7 @@
     /** Build a secure socket factory based on no keystore and a lax trust manager.
     * This allows use of SSL for privacy but not identification. */
     protected static javax.net.ssl.SSLSocketFactory getSecureSocketFactory()
-        throws MetacartaException
+        throws LCFException
     {
             try
             {
@@ -566,18 +566,18 @@
             }
             catch (java.security.NoSuchAlgorithmException e)
             {
-                throw new MetacartaException("No such algorithm: "+e.getMessage(),e);
+                throw new LCFException("No such algorithm: "+e.getMessage(),e);
             }
             catch (java.security.KeyManagementException e)
             {
-                throw new MetacartaException("Key management exception: "+e.getMessage(),e);
+                throw new LCFException("Key management exception: "+e.getMessage(),e);
             }
     }
 
     /** Create a socket in a manner consistent with all of our specified parameters.
     */
     protected Socket createSocket(long responseRetryCount)
-            throws IOException, MetacartaException
+            throws IOException, LCFException
     {
             Socket socket;
             if (protocol.equals("https"))
@@ -593,7 +593,7 @@
                     }
                     catch (IOException e)
                     {
-                            throw new MetacartaException("Couldn't set up SSL connection to ingestion API: "+e.getMessage(),e);
+                            throw new LCFException("Couldn't set up SSL connection to ingestion API: "+e.getMessage(),e);
                     }
             }
             else
@@ -1026,7 +1026,7 @@
                                         
                                         // A negative number means http error of some kind.
                                         if (codeValue < 0)
-                                                throw new MetacartaException("Http protocol error");
+                                                throw new LCFException("Http protocol error");
 
                                         // 200 means we got a status document back
                                         if (codeValue == 200)
@@ -1044,11 +1044,11 @@
                                         //    If the situation is (2), then we CAN'T retry if we already read any of the stream; therefore
                                         //    we are forced to throw a "service interrupted" exception, and let the caller reschedule
                                         //    the ingestion.
-                                        // 3) Something is wrong with the setup, e.g. bad credentials.  In this case we chuck a MetacartaException,
+                                        // 3) Something is wrong with the setup, e.g. bad credentials.  In this case we chuck a LCFException,
                                         //    since this will abort the current activity entirely.
 
                                         if (codeValue == 401)
-                                                throw new MetacartaException("Bad credentials for ingestion",MetacartaException.SETUP_ERROR);
+                                                throw new LCFException("Bad credentials for ingestion",LCFException.SETUP_ERROR);
 
                                         if (codeValue >= 400 && codeValue < 500)
                                         {
@@ -1059,7 +1059,7 @@
                                         // If this continues, we should indeed abort the job.  Retries should not go on indefinitely either; 2 hours is plenty
                                         long currentTime = System.currentTimeMillis();
                                         throw new ServiceInterruption("Error "+Integer.toString(codeValue)+" from ingestion request; ingestion will be retried again later",
-                                                new MetacartaException("Ingestion HTTP error code "+Integer.toString(codeValue)),
+                                                new LCFException("Ingestion HTTP error code "+Integer.toString(codeValue)),
                                                 currentTime + interruptionRetryTime,
                                                 currentTime + 2L * 60L * 60000L,
                                                 -1,
@@ -1094,7 +1094,7 @@
                 }
                 catch (UnsupportedEncodingException ioe)
                 {
-                        throw new MetacartaException("Fatal ingestion error: "+ioe.getMessage(),ioe);
+                        throw new LCFException("Fatal ingestion error: "+ioe.getMessage(),ioe);
                 }
                 catch (java.net.SocketTimeoutException ioe)
                 {
@@ -1264,7 +1264,7 @@
                                         int codeValue = cd.getCodeValue();
                                         
                                         if (codeValue < 0)
-                                                throw new MetacartaException("Http protocol error");
+                                                throw new LCFException("Http protocol error");
 
                                         // 200 means we got an xml document back
                                         if (codeValue == 200)
@@ -1276,13 +1276,13 @@
 
                                         // We ignore everything in the range from 400-500 now
                                         if (codeValue == 401)
-                                                throw new MetacartaException("Bad credentials for ingestion",MetacartaException.SETUP_ERROR);
+                                                throw new LCFException("Bad credentials for ingestion",LCFException.SETUP_ERROR);
 
                                         if (codeValue >= 400 && codeValue < 500)
                                                 return;
 
                                         // Anything else means the document didn't delete.  Throw the error.
-                                        throw new MetacartaException("Error deleting document: '"+cd.getDescription()+"'");
+                                        throw new LCFException("Error deleting document: '"+cd.getDescription()+"'");
                                 }
                                 finally
                                 {
@@ -1313,7 +1313,7 @@
                 }
                 catch (UnsupportedEncodingException ioe)
                 {
-                        throw new MetacartaException("Fatal ingestion error: "+ioe.getMessage(),ioe);
+                        throw new LCFException("Fatal ingestion error: "+ioe.getMessage(),ioe);
                 }
                 catch (InterruptedIOException ioe)
                 {
@@ -1410,7 +1410,7 @@
 
                                         int codeValue = cd.getCodeValue();
                                         if (codeValue < 0)
-                                                throw new MetacartaException("Http protocol error");
+                                                throw new LCFException("Http protocol error");
 
                                         // 200 means everything went OK
                                         if (codeValue == 200)
@@ -1421,10 +1421,10 @@
 
                                         // We ignore everything in the range from 400-500 now
                                         if (codeValue == 401)
-                                                throw new MetacartaException("Bad credentials for ingestion",MetacartaException.SETUP_ERROR);
+                                                throw new LCFException("Bad credentials for ingestion",LCFException.SETUP_ERROR);
 
                                         // Anything else means the info request failed.
-                                        throw new MetacartaException("Error connecting to ingestion API: '"+cd.getDescription()+"'");
+                                        throw new LCFException("Error connecting to ingestion API: '"+cd.getDescription()+"'");
                                 }
                                 finally
                                 {
@@ -1455,7 +1455,7 @@
                 }
                 catch (UnsupportedEncodingException ioe)
                 {
-                        throw new MetacartaException("Fatal ingestion error: "+ioe.getMessage(),ioe);
+                        throw new LCFException("Fatal ingestion error: "+ioe.getMessage(),ioe);
                 }
                 catch (InterruptedIOException ioe)
                 {
@@ -1541,13 +1541,13 @@
         }
         
         public String getDescription()
-            throws MetacartaException
+            throws LCFException
         {
             return res + "\r\n" + ((returnDoc!=null)?returnDoc.getXML():"");
         }
         
         public void parseIngestionResponse()
-            throws MetacartaException
+            throws LCFException
         {
             // Look at response XML
             String statusValue = "unknown";
@@ -1596,20 +1596,20 @@
                 if (statusValue.equals("0"))
                     return;
                 
-                throw new MetacartaException("Ingestion returned error: "+statusValue);
+                throw new LCFException("Ingestion returned error: "+statusValue);
             }
             else
-                throw new MetacartaException("XML parsing error on response");
+                throw new LCFException("XML parsing error on response");
         }
         
         public void parseRemovalResponse()
-            throws MetacartaException
+            throws LCFException
         {
             parseIngestionResponse();
         }
         
         public void parseStatusResponse()
-            throws MetacartaException
+            throws LCFException
         {
             // Look at response XML
             String statusValue = "unknown";
@@ -1645,10 +1645,10 @@
                 if (statusValue.equals("OK"))
                     return;
                 
-                throw new MetacartaException("Status error: "+statusValue);
+                throw new LCFException("Status error: "+statusValue);
             }
             else
-                throw new MetacartaException("XML parsing error on response");
+                throw new LCFException("XML parsing error on response");
         }
     }
     

Modified: incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/lucene/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java Wed Feb 17 15:57:27 2010
@@ -78,7 +78,7 @@
         /** Close the connection.  Call this before discarding the connection.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {
                 poster = null;
                 super.disconnect();
@@ -86,17 +86,17 @@
 
         /** Set up a session */
         protected void getSession()
-                throws MetacartaException
+                throws LCFException
         {
                 if (poster == null)
                 {
                         String protocol = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL);
                         if (protocol == null || protocol.length() == 0)
-                                throw new MetacartaException("Missing parameter: "+org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL);
+                                throw new LCFException("Missing parameter: "+org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL);
                                 
                         String server = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER);
                         if (server == null || server.length() == 0)
-                                throw new MetacartaException("Missing parameter: "+org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER);
+                                throw new LCFException("Missing parameter: "+org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER);
 
                         String port = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PORT);
                         if (port == null || port.length() == 0)
@@ -127,7 +127,7 @@
                         }
                         catch (NumberFormatException e)
                         {
-                                throw new MetacartaException(e.getMessage());
+                                throw new LCFException(e.getMessage());
                         }
                 }
         }
@@ -136,7 +136,7 @@
         *@return the connection's status as a displayable string.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
                 try
                 {
@@ -162,7 +162,7 @@
         * the document will not need to be sent again to the output data store.
         */
         public String getOutputDescription(OutputSpecification spec)
-                throws MetacartaException
+                throws LCFException
         {
                 // No output description data at this time.
                 return "";
@@ -183,7 +183,7 @@
         *@return the document status (accepted or permanently rejected).
         */
         public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 // Establish a session
                 getSession();
@@ -202,7 +202,7 @@
         *@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 MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 // Establish a session
                 getSession();



Mime
View raw message