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 [16/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/crawle...
Date Wed, 17 Feb 2010 15:57:35 GMT
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/JobQueue.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/JobQueue.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/JobQueue.java Wed Feb 17 15:57:27 2010
@@ -21,7 +21,7 @@
 import org.apache.lcf.core.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.util.*;
 
 /** This is the job queue manager class.  It is responsible for managing the jobqueue database table.
@@ -136,7 +136,7 @@
         *@param database is the database handle.
         */
         public JobQueue(IDBInterface database)
-                throws MetacartaException
+                throws LCFException
         {
                 super(database,"jobqueue");
                 prereqEventManager = new PrereqEventManager(database);
@@ -145,7 +145,7 @@
         /** Install or upgrade.
         */
         public void install(String jobsTable, String jobsColumn)
-                throws MetacartaException
+                throws LCFException
         {
                 // It is possible that we will fail to properly create the unique index, so structure the code to retry after fixup should this occur...
                 while (true)
@@ -222,7 +222,7 @@
                                         }
                                 }
                         }
-                        catch (MetacartaException e)
+                        catch (LCFException e)
                         {
                                 signalRollback();
                                 throw e;
@@ -307,7 +307,7 @@
                                 {
                                         performAddIndex(null,uniqueIndex);
                                 }
-                                catch (MetacartaException e)
+                                catch (LCFException e)
                                 {
                                         if (e.getMessage().indexOf("could not create unique index") == -1)
                                                 throw e;
@@ -325,7 +325,7 @@
         
         /** Remove duplicates, as part of upgrade */
         protected void removeDuplicates()
-                throws MetacartaException
+                throws LCFException
         {
                 // If we get here it means we could not create the unique index on this table.
                 // We therefore need to remove duplicate rows, finish the job of creating the index, and try again.
@@ -350,7 +350,7 @@
                 }
                 catch (NumberFormatException e)
                 {
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
 
                 // Now, amass a list of duplicates
@@ -394,7 +394,7 @@
 
         /** Analyze job tables due to major event */
         public void unconditionallyAnalyzeTables()
-                throws MetacartaException
+                throws LCFException
         {
                 try
                 {
@@ -412,7 +412,7 @@
 	/** Analyze job tables that need analysis.
 	*/
 	public void conditionallyAnalyzeTables()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (tracker.checkAnalyze())
 		{
@@ -438,7 +438,7 @@
         /** Uninstall.
         */
         public void deinstall()
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -446,7 +446,7 @@
                         prereqEventManager.deinstall();
                         performDrop(null);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -467,7 +467,7 @@
         * reasonable, so the jobs can be restarted and work properly to completion.
         */
         public void restart()
-                throws MetacartaException
+                throws LCFException
         {
                 // Map ACTIVE back to PENDING.
                 HashMap map = new HashMap();
@@ -513,7 +513,7 @@
         *@param jobID is the job identifier.
         */
         public void clearFailTimes(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -528,7 +528,7 @@
         * resets any active documents back to the right state (waiting for stuffing).
         */
         public void resetDocumentWorkerStatus()
-                throws MetacartaException
+                throws LCFException
         {
                 // Map ACTIVE back to PENDING.
                 HashMap map = new HashMap();
@@ -549,7 +549,7 @@
         /** Reset doc delete worker status.
         */
         public void resetDocDeleteWorkerStatus()
-                throws MetacartaException
+                throws LCFException
         {
                 HashMap map = new HashMap();
                 ArrayList list = new ArrayList();
@@ -569,7 +569,7 @@
         *@param jobID is the job identifier.
         */
         public void prepareFullScan(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 // Delete PENDING and ACTIVE entries
                 ArrayList list = new ArrayList();
@@ -611,7 +611,7 @@
 	*@param jobID is the job identifier.
 	*/
 	public void prepareIncrementalScan(Long jobID)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Delete PENDING and ACTIVE entries
 		ArrayList list = new ArrayList();
@@ -640,7 +640,7 @@
         *@param identifiers is the set of document identifiers.
         */
         public void deleteIngestedDocumentIdentifiers(DocumentDescription[] identifiers)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 StringBuffer sb = new StringBuffer();
@@ -659,7 +659,7 @@
 
         /** Check if there are any outstanding active documents for a job */
         public boolean checkJobBusy(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -676,7 +676,7 @@
         *@param jobID is the job identifier.
         */
         public void deleteAllJobRecords(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -688,7 +688,7 @@
 
         /** Write out a document priority */
         public void writeDocPriority(long currentTime, Long rowID, double priority)
-                throws MetacartaException
+                throws LCFException
         {
                 HashMap map = new HashMap();
                 map.put(prioritySetField,new Long(currentTime));
@@ -702,7 +702,7 @@
         /** Set the "completed" status for a record.
         */
         public void updateCompletedRecord(Long recID, int currentStatus)
-                throws MetacartaException
+                throws LCFException
         {
                 int newStatus;
                 String actionFieldValue;
@@ -722,7 +722,7 @@
                         checkTimeValue = new Long(0L);
                         break;
                 default:
-                        throw new MetacartaException("Unexpected jobqueue status - record id "+recID.toString()+", expecting active status");
+                        throw new LCFException("Unexpected jobqueue status - record id "+recID.toString()+", expecting active status");
                 }
                 
                 HashMap map = new HashMap();
@@ -745,7 +745,7 @@
         *@param currentStatus is the current status
         */
         public void updateActiveRecord(Long id, int currentStatus)
-                throws MetacartaException
+                throws LCFException
         {
                 int newStatus;
                 switch (currentStatus)
@@ -757,7 +757,7 @@
                         newStatus = STATUS_ACTIVEPURGATORY;
                         break;
                 default:
-                        throw new MetacartaException("Unexpected status value for jobqueue record "+id.toString()+"; got "+Integer.toString(currentStatus));
+                        throw new LCFException("Unexpected status value for jobqueue record "+id.toString()+"; got "+Integer.toString(currentStatus));
                 }
 
                 ArrayList list = new ArrayList();
@@ -775,7 +775,7 @@
         */
         public void setStatus(Long id, int status,
                 Long checkTime, int action, long failTime, int failCount)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(id);
@@ -800,7 +800,7 @@
         /** Set the status of a document to "being deleted".
         */
         public void setDeletingStatus(Long id)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(id);
@@ -812,7 +812,7 @@
 
         /** Set the status of a document to be "no longer deleting" */
         public void setUndeletingStatus(Long id)
-                throws MetacartaException
+                throws LCFException
         {
                 HashMap map = new HashMap();
                 map.put(statusField,statusToString(STATUS_COMPLETE));
@@ -829,7 +829,7 @@
         *@param ids is the set of job queue id's
         */
         public void deleteRecordMultiple(Long[] ids)
-                throws MetacartaException
+                throws LCFException
         {
                 // Delete in chunks
                 int maxInClause = getMaxInClause();
@@ -860,7 +860,7 @@
         /** Do a batch of deletes.
         */
         protected void doDeletes(ArrayList list, String queryPart)
-                throws MetacartaException
+                throws LCFException
         {
                 // Clean out prereqevents table first
                 prereqEventManager.deleteRows(queryPart,list);
@@ -871,7 +871,7 @@
         *@param id is the job queue id.
         */
         public void deleteRecord(Long id)
-                throws MetacartaException
+                throws LCFException
         {
                 deleteRecordMultiple(new Long[]{id});
         }
@@ -881,7 +881,7 @@
         */
         public boolean updateExistingRecordInitial(Long recordID, int currentStatus, Long checkTimeValue,
                 long desiredExecuteTime, long currentTime, double desiredPriority, String[] prereqEvents)
-                throws MetacartaException
+                throws LCFException
         {
                 // The general rule here is:
                 // If doesn't exist, make a PENDING entry.
@@ -973,7 +973,7 @@
         */
         public void insertNewRecordInitial(Long jobID, String docHash, String docID, double desiredDocPriority,
                 long desiredExecuteTime, long currentTime, String[] prereqEvents)
-                throws MetacartaException
+                throws LCFException
         {
                 // No prerequisites should be possible at this point.
                 HashMap map = new HashMap();
@@ -1001,7 +1001,7 @@
         * doneDocumentsInitial() method does not clean up seeds from previous runs wrongly.
         */
         public void addRemainingDocumentsInitial(Long jobID, String[] docIDHashes)
-                throws MetacartaException
+                throws LCFException
         {
                 if (docIDHashes.length == 0)
                         return;
@@ -1079,7 +1079,7 @@
 
         /** Process the specified set of documents. */
         protected void processRemainingDocuments(Map idMap, String query, ArrayList list, Map inSet)
-                throws MetacartaException
+                throws LCFException
         {
                 IResultSet set = performQuery("SELECT "+idField+","+docHashField+" FROM "+getTableName()+
                         " WHERE "+query+" FOR UPDATE",list,null,null);
@@ -1098,7 +1098,7 @@
 
         /** Update the specified set of documents to be "NEWSEED" */
         protected void updateRemainingDocuments(String query, ArrayList list)
-                throws MetacartaException
+                throws LCFException
         {
                 HashMap map = new HashMap();
                 map.put(isSeedField,seedstatusToString(SEEDSTATUS_NEWSEED));
@@ -1113,7 +1113,7 @@
         *@param isPartial is true of the passed list of seeds is not complete.
         */
         public void doneDocumentsInitial(Long jobID, boolean isPartial)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 HashMap map = new HashMap();
@@ -1137,7 +1137,7 @@
         *@return the document identifier hashes that are currently considered to be seeds.
         */
         public String[] getAllSeeds(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1160,7 +1160,7 @@
         public boolean updateExistingRecord(Long recordID, int currentStatus, Long checkTimeValue,
                 long desiredExecuteTime, long currentTime, boolean otherChangesSeen, double desiredPriority,
                 String[] prereqEvents)
-                throws MetacartaException
+                throws LCFException
         {
                 boolean rval = false;
                 HashMap map = new HashMap();
@@ -1287,7 +1287,7 @@
         */
         public void insertNewRecord(Long jobID, String docIDHash, String docID, double desiredDocPriority, long desiredExecuteTime,
                 long currentTime, String[] prereqEvents)
-                throws MetacartaException
+                throws LCFException
         {
                 HashMap map = new HashMap();
                 Long recordID = new Long(IDFactory.make());
@@ -1311,7 +1311,7 @@
         /** Convert seedstatus value to a string.
         */
         public static String seedstatusToString(int status)
-                throws MetacartaException
+                throws LCFException
         {
                 switch (status)
                 {
@@ -1322,37 +1322,37 @@
                 case SEEDSTATUS_NEWSEED:
                         return "N";
                 default:
-                        throw new MetacartaException("Invalid seed status: "+Integer.toString(status));
+                        throw new LCFException("Invalid seed status: "+Integer.toString(status));
                 }
         }
 
         /** Convert seedstatus field value to a boolean.
         */
         public static int stringToSeedstatus(String x)
-                throws MetacartaException
+                throws LCFException
         {
                 if (x == null || x.length() == 0)
                         return SEEDSTATUS_NOTSEED;
                 Integer y = (Integer)seedstatusMap.get(x);
                 if (y == null)
-                        throw new MetacartaException("Unknown seed status code: "+x);
+                        throw new LCFException("Unknown seed status code: "+x);
                 return y.intValue();
         }
 
         /** Convert action field value to integer.
         */
         public static int stringToAction(String value)
-                throws MetacartaException
+                throws LCFException
         {
                 Integer x = (Integer)actionMap.get(value);
                 if (x == null)
-                        throw new MetacartaException("Unknown action string: '"+value+"'");
+                        throw new LCFException("Unknown action string: '"+value+"'");
                 return x.intValue();
         }
         
         /** Convert integer to action string */
         public static String actionToString(int action)
-                throws MetacartaException
+                throws LCFException
         {
                 switch (action)
                 {
@@ -1361,7 +1361,7 @@
                 case ACTION_REMOVE:
                         return "D";
                 default:
-                        throw new MetacartaException("Bad action value: "+Integer.toString(action));
+                        throw new LCFException("Bad action value: "+Integer.toString(action));
                 }
         }
                 
@@ -1370,11 +1370,11 @@
         *@return the integer.
         */
         public static int stringToStatus(String value)
-                throws MetacartaException
+                throws LCFException
         {
                 Integer x = (Integer)statusMap.get(value);
                 if (x == null)
-                        throw new MetacartaException("Unknown status string: '"+value+"'");
+                        throw new LCFException("Unknown status string: '"+value+"'");
                 return x.intValue();
         }
 
@@ -1383,7 +1383,7 @@
         *@return the database string.
         */
         public static String statusToString(int status)
-                throws MetacartaException
+                throws LCFException
         {
                 switch (status)
                 {
@@ -1406,7 +1406,7 @@
                 case STATUS_ACTIVENEEDRESCANPURGATORY:
                         return "f";
                 default:
-                        throw new MetacartaException("Bad status value: "+Integer.toString(status));
+                        throw new LCFException("Bad status value: "+Integer.toString(status));
                 }
 
         }
@@ -1417,9 +1417,9 @@
         *@return the hash code.
         */
         public static String getHashCode(String documentIdentifier)
-                throws MetacartaException
+                throws LCFException
         {
-                return Metacarta.hash(documentIdentifier);
+                return LCF.hash(documentIdentifier);
         }
 
         /** Analyze tracker class.
@@ -1530,7 +1530,7 @@
                 *@return true if it should be included, false otherwise.
                 */
                 public boolean checkInclude(IResultRow row)
-                        throws MetacartaException
+                        throws LCFException
                 {
                         Long jobID = (Long)row.getValue(jobIDField);
                         String docIDHash = (String)row.getValue(docHashField);
@@ -1546,7 +1546,7 @@
                 *@return true if we need to keep going, or false if we are done.
                 */
                 public boolean checkContinue()
-                        throws MetacartaException
+                        throws LCFException
                 {
                         return true;
                 }

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/Jobs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/Jobs.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/Jobs.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/Jobs.java Wed Feb 17 15:57:27 2010
@@ -178,7 +178,7 @@
         *@param database is the database handle.
         */
         public Jobs(IThreadContext threadContext, IDBInterface database)
-                throws MetacartaException
+                throws LCFException
         {
                 super(database,"jobs");
                 scheduleManager = new ScheduleManager(threadContext,database);
@@ -192,7 +192,7 @@
         /** Install or upgrade this table.
         */
         public void install(String outputTableName, String outputNameField, String connectionTableName, String connectionNameField)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -304,7 +304,7 @@
                         scheduleManager.install(getTableName(),idField);
                         hopFilterManager.install(getTableName(),idField);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -323,7 +323,7 @@
         /** Uninstall.
         */
         public void deinstall()
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -332,7 +332,7 @@
                         scheduleManager.deinstall();
                         performDrop(null);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -352,7 +352,7 @@
         *@Return the time, in minutes.
         */
         public int getAnalyzeTime()
-                throws MetacartaException
+                throws LCFException
         {
                 // Since we never expect jobs to grow rapidly, every 24hrs should always be fine
                 return 24 * 60;
@@ -361,7 +361,7 @@
         /** Analyze job tables that need analysis.
         */
         public void analyzeTables()
-                throws MetacartaException
+                throws LCFException
         {
                 analyzeTable();
         }
@@ -369,7 +369,7 @@
         /** Read schedule records for a specified set of jobs.  Cannot use caching!
         */
         public ScheduleRecord[][] readScheduleRecords(Long[] jobIDs)
-                throws MetacartaException
+                throws LCFException
         {
                 Map uniqueIDs = new HashMap();
                 int i = 0;
@@ -411,7 +411,7 @@
                         signalRollback();
                         throw e;
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -450,7 +450,7 @@
         *@return the array of all jobs.
         */
         public IJobDescription[] getAll()
-                throws MetacartaException
+                throws LCFException
         {
                 // Begin transaction
                 beginTransaction();
@@ -477,7 +477,7 @@
                         }
                         return loadMultiple(ids,readOnlies);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -497,7 +497,7 @@
         *@return a resultset with "jobid" and "connectionname" fields.
         */
         public IResultSet getActiveJobConnections()
-                throws MetacartaException
+                throws LCFException
         {
                 return performQuery("SELECT "+idField+" AS jobid,"+connectionNameField+" AS connectionname FROM "+getTableName()+" WHERE "+
                         statusField+" IN ("+
@@ -509,7 +509,7 @@
         *@return the array of connection names corresponding to active jobs.
         */
         public String[] getActiveConnectionNames()
-                throws MetacartaException
+                throws LCFException
         {
                 IResultSet set = performQuery("SELECT DISTINCT "+connectionNameField+" FROM "+getTableName()+" WHERE "+
                         statusField+" IN ("+
@@ -528,7 +528,7 @@
 
         /** Count the number of jobs that have a specified priority level */
         public int countPriorityJobs(int priority)
-                throws MetacartaException
+                throws LCFException
         {
                 IResultSet set = performQuery("SELECT COUNT(*) AS countvar FROM "+getTableName()+" WHERE "+priorityField+"="+Integer.toString(priority)+
                         " AND "+
@@ -542,7 +542,7 @@
         /** Create a job.
         */
         public IJobDescription create()
-                throws MetacartaException
+                throws LCFException
         {
                 JobDescription rval = new JobDescription();
                 rval.setIsNew(true);
@@ -554,7 +554,7 @@
         *@param id is the job id.
         */
         public void delete(Long id)
-                throws MetacartaException
+                throws LCFException
         {
                 StringSetBuffer ssb = new StringSetBuffer();
                 ssb.add(getJobsKey());
@@ -570,7 +570,7 @@
                         params.add(id);
                         performDelete("WHERE "+idField+"=?",params,cacheKeys);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -591,7 +591,7 @@
         *@return the editable job description.
         */
         public IJobDescription load(Long id, boolean readOnly)
-                throws MetacartaException
+                throws LCFException
         {
                 return loadMultiple(new Long[]{id}, new boolean[]{readOnly})[0];
         }
@@ -602,7 +602,7 @@
         *@return the array of objects, in order.
         */
         public IJobDescription[] loadMultiple(Long[] ids, boolean[] readOnlies)
-                throws MetacartaException
+                throws LCFException
         {
                 // Build description objects
                 JobObjectDescription[] objectDescriptions = new JobObjectDescription[ids.length];
@@ -625,7 +625,7 @@
         *@param jobDescription is the job description.
         */
         public void save(IJobDescription jobDescription)
-                throws MetacartaException
+                throws LCFException
         {
                 // The invalidation keys for this are both the general and the specific.
                 Long id = jobDescription.getID();
@@ -719,7 +719,7 @@
 
                         cacheManager.invalidateKeys(ch);
                     }
-                    catch (MetacartaException e)
+                    catch (LCFException e)
                     {
                         signalRollback();
                         throw e;
@@ -743,7 +743,7 @@
         /** This method is called on a restart.
         */
         public void restart()
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -797,7 +797,7 @@
                         // No need to do anything to the queue; it looks like it can take care of
                         // itself.
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -818,7 +818,7 @@
         *@param oldStatusValue is the current status value for the job.
         */
         public void noteConnectorDeregistration(Long jobID, int oldStatusValue)
-                throws MetacartaException
+                throws LCFException
         {
                 int newStatusValue;
                 // The following states are special, in that when the underlying connector goes away, the jobs
@@ -856,7 +856,7 @@
         *@param oldStatusValue is the current status value for the job.
         */
         public void noteConnectorRegistration(Long jobID, int oldStatusValue)
-                throws MetacartaException
+                throws LCFException
         {
                 int newStatusValue;
                 // The following states are special, in that when the underlying connector returns, the jobs
@@ -888,7 +888,7 @@
         /** Check whether a job's status indicates that it is in ACTIVE or ACTIVESEEDING state.
         */
         public boolean checkJobActive(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 StringSet cacheKeys = new StringSet(getJobStatusKey());
                 ArrayList list = new ArrayList();
@@ -907,7 +907,7 @@
         /** Reset startup worker thread status.
         */
         public void resetStartupWorkerStatus()
-                throws MetacartaException
+                throws LCFException
         {
                 // We have to handle all states that the startup thread would resolve, and change them to something appropriate.
 
@@ -932,7 +932,7 @@
         /** Reset as part of restoring seeding worker threads.
         */
         public void resetSeedingWorkerStatus()
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -971,7 +971,7 @@
                         performUpdate(map,"WHERE "+statusField+"=?",list,invKey);
 
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -994,7 +994,7 @@
         *@param windowEnd is the window end time, if any
         */
         public void startJob(Long jobID, Long windowEnd)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1012,7 +1012,7 @@
         *@param startTime is the current time in milliseconds from start of epoch.
         */
         public void noteJobStarted(Long jobID, long startTime)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -1022,7 +1022,7 @@
                         IResultSet set = performQuery("SELECT "+statusField+","+connectionNameField+","+outputNameField+" FROM "+getTableName()+" WHERE "+
                                 idField+"=? FOR UPDATE",list,null,null);
                         if (set.getRowCount() == 0)
-                                throw new MetacartaException("Can't find job "+jobID.toString());
+                                throw new LCFException("Can't find job "+jobID.toString());
                         IResultRow row = set.getRow(0);
                         int status = stringToStatus((String)row.getValue(statusField));
                         int newStatus;
@@ -1042,7 +1042,7 @@
                                 break;
                         default:
                                 // Complain!
-                                throw new MetacartaException("Unexpected job status encountered: "+Integer.toString(status));
+                                throw new LCFException("Unexpected job status encountered: "+Integer.toString(status));
                         }
 
                         HashMap map = new HashMap();
@@ -1054,7 +1054,7 @@
                         map.put(lastCheckTimeField,new Long(startTime));
                         performUpdate(map,"WHERE "+idField+"=?",list,new StringSet(getJobStatusKey()));
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1075,7 +1075,7 @@
         *@param seedTime is the job seed time.
         */
         public void noteJobSeeded(Long jobID, long seedTime)
-                throws MetacartaException
+                throws LCFException
         {
                 // We have to convert the current status to the non-seeding equivalent
                 beginTransaction();
@@ -1086,7 +1086,7 @@
                         IResultSet set = performQuery("SELECT "+statusField+" FROM "+getTableName()+" WHERE "+
                                 idField+"=? FOR UPDATE",list,null,null);
                         if (set.getRowCount() == 0)
-                                throw new MetacartaException("Can't find job "+jobID.toString());
+                                throw new LCFException("Can't find job "+jobID.toString());
                         IResultRow row = set.getRow(0);
                         int status = stringToStatus((String)row.getValue(statusField));
                         int newStatus;
@@ -1114,7 +1114,7 @@
                                 newStatus = STATUS_ABORTINGFORRESTART;
                                 break;
                         default:
-                                throw new MetacartaException("Unexpected job status encountered: "+Integer.toString(status));
+                                throw new LCFException("Unexpected job status encountered: "+Integer.toString(status));
                         }
                         HashMap map = new HashMap();
                         map.put(statusField,statusToString(newStatus));
@@ -1126,7 +1126,7 @@
                         signalRollback();
                         throw e;
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1144,7 +1144,7 @@
         *@param windowEnd is the window end time, if any.
         */
         public void unwaitJob(Long jobID, int newStatus, Long windowEnd)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1160,7 +1160,7 @@
         *  STATUS_ACTIVEWAITSEEDING or STATUS_PAUSEDWAITSEEDING)
         */
         public void waitJob(Long jobID, int newStatus)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1176,7 +1176,7 @@
         *@return true if there wasn't an abort already logged for this job.
         */
         public boolean abortJob(Long jobID, String errorText)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -1187,7 +1187,7 @@
                         IResultSet set = performQuery("SELECT "+statusField+" FROM "+getTableName()+
                                 " WHERE "+idField+"=? FOR UPDATE",list,null,null);
                         if (set.getRowCount() == 0)
-                                throw new MetacartaException("Job does not exist: "+jobID);
+                                throw new LCFException("Job does not exist: "+jobID);
                         IResultRow row = set.getRow(0);
                         int status = stringToStatus(row.getValue(statusField).toString());
                         if (status == STATUS_ABORTING || status == STATUS_ABORTINGSEEDING || status == STATUS_ABORTINGSTARTINGUP)
@@ -1217,7 +1217,7 @@
                                 newStatus = STATUS_ABORTINGSEEDING;
                                 break;
                         default:
-                                throw new MetacartaException("Job "+jobID+" is not active");
+                                throw new LCFException("Job "+jobID+" is not active");
                         }
                         // Pause the job
                         HashMap map = new HashMap();
@@ -1226,7 +1226,7 @@
                         performUpdate(map,"WHERE "+idField+"=?",list,new StringSet(getJobStatusKey()));
                         return true;
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1246,7 +1246,7 @@
         *@param jobID is the job id.
         */
         public void abortRestartJob(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -1257,7 +1257,7 @@
                         IResultSet set = performQuery("SELECT "+statusField+" FROM "+getTableName()+
                                 " WHERE "+idField+"=? FOR UPDATE",list,null,null);
                         if (set.getRowCount() == 0)
-                                throw new MetacartaException("Job does not exist: "+jobID);
+                                throw new LCFException("Job does not exist: "+jobID);
                         IResultRow row = set.getRow(0);
                         int status = stringToStatus(row.getValue(statusField).toString());
                         if (status == STATUS_ABORTINGFORRESTART || status == STATUS_ABORTINGFORRESTARTSEEDING || status == STATUS_ABORTINGSTARTINGUPFORRESTART)
@@ -1284,14 +1284,14 @@
                                 newStatus = STATUS_ABORTINGFORRESTARTSEEDING;
                                 break;
                         default:
-                                throw new MetacartaException("Job "+jobID+" is not restartable");
+                                throw new LCFException("Job "+jobID+" is not restartable");
                         }
                         // reset the job
                         HashMap map = new HashMap();
                         map.put(statusField,statusToString(newStatus));
                         performUpdate(map,"WHERE "+idField+"=?",list,new StringSet(getJobStatusKey()));
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1311,7 +1311,7 @@
         *@param jobID is the job id.
         */
         public void pauseJob(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -1322,7 +1322,7 @@
                         IResultSet set = performQuery("SELECT "+statusField+" FROM "+getTableName()+
                                 " WHERE "+idField+"=? FOR UPDATE",list,null,null);
                         if (set.getRowCount() == 0)
-                                throw new MetacartaException("Job does not exist: "+jobID);
+                                throw new LCFException("Job does not exist: "+jobID);
                         IResultRow row = set.getRow(0);
                         int status = stringToStatus(row.getValue(statusField).toString());
                         int newStatus;
@@ -1343,14 +1343,14 @@
                                 newStatus = STATUS_PAUSEDWAITSEEDING;
                                 break;
                         default:
-                                throw new MetacartaException("Job "+jobID+" is not active");
+                                throw new LCFException("Job "+jobID+" is not active");
                         }
                         // Pause the job
                         HashMap map = new HashMap();
                         map.put(statusField,statusToString(newStatus));
                         performUpdate(map,"WHERE "+idField+"=?",list,new StringSet(getJobStatusKey()));
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1370,7 +1370,7 @@
         *@param jobID is the job id.
         */
         public void restartJob(Long jobID)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -1381,7 +1381,7 @@
                         IResultSet set = performQuery("SELECT "+statusField+","+connectionNameField+","+outputNameField+" FROM "+getTableName()+
                                 " WHERE "+idField+"=? FOR UPDATE",list,null,null);
                         if (set.getRowCount() == 0)
-                                throw new MetacartaException("Job does not exist: "+jobID);
+                                throw new LCFException("Job does not exist: "+jobID);
                         IResultRow row = set.getRow(0);
                         int status = stringToStatus(row.getValue(statusField).toString());
                         String connectionName = (String)row.getValue(connectionNameField);
@@ -1408,14 +1408,14 @@
                                 newStatus = STATUS_ACTIVEWAITSEEDING;
                                 break;
                         default:
-                                throw new MetacartaException("Job "+jobID+" is not paused");
+                                throw new LCFException("Job "+jobID+" is not paused");
                         }
                         // Pause the job
                         HashMap map = new HashMap();
                         map.put(statusField,statusToString(newStatus));
                         performUpdate(map,"WHERE "+idField+"=?",list,new StringSet(getJobStatusKey()));
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1437,7 +1437,7 @@
         *@param reseedTime is the reseed time.
         */
         public void writeStatus(Long jobID, int status, Long reseedTime)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1452,7 +1452,7 @@
         *@param status is the desired status.
         */
         public void writeStatus(Long jobID, int status)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1466,7 +1466,7 @@
         *@param currentTime is the current time.
         */
         public void updateLastTime(Long jobID, long currentTime)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1481,7 +1481,7 @@
         *@param finishTime is the finish time.
         */
         public void finishJob(Long jobID, long finishTime)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1500,7 +1500,7 @@
         *@param jobID is the job id.
         */
         public void finishAbortJob(Long jobID, long abortTime)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(jobID);
@@ -1519,7 +1519,7 @@
         *@return true if there is a reference, false otherwise.
         */
         public boolean checkIfReference(String connectionName)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(connectionName);
@@ -1533,7 +1533,7 @@
         *@return true if there is a reference, false otherwise.
         */
         public boolean checkIfOutputReference(String connectionName)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(connectionName);
@@ -1547,7 +1547,7 @@
         *@return the set of job id's associated with that connection.
         */
         public IJobDescription[] findJobsForConnection(String connectionName)
-                throws MetacartaException
+                throws LCFException
         {
                 // Begin transaction
                 beginTransaction();
@@ -1576,7 +1576,7 @@
                         }
                         return loadMultiple(ids,readOnlies);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1599,7 +1599,7 @@
         *@return true if such jobs exist.
         */
         public boolean deletingJobsPresent()
-                throws MetacartaException
+                throws LCFException
         {
                 IResultSet set = performQuery("SELECT "+idField+" FROM "+getTableName()+" WHERE "+
                         statusField+" IN ("+quoteSQLString(statusToString(STATUS_READYFORDELETE))+","+
@@ -1614,7 +1614,7 @@
         *@return true if such jobs exist.
         */
         public boolean activeJobsPresent()
-                throws MetacartaException
+                throws LCFException
         {
                 // To improve the postgres CPU usage of the system at rest, we do a *fast* check to be
                 // sure there are ANY jobs in an active state.
@@ -1633,11 +1633,11 @@
         *@return the status value.
         */
         public static int stringToStatus(String value)
-                throws MetacartaException
+                throws LCFException
         {
                 Integer x = (Integer)statusMap.get(value);
                 if (x == null)
-                        throw new MetacartaException("Bad status value: '"+value+"'");
+                        throw new LCFException("Bad status value: '"+value+"'");
                 return x.intValue();
         }
 
@@ -1646,7 +1646,7 @@
         *@return the string.
         */
         public static String statusToString(int status)
-                throws MetacartaException
+                throws LCFException
         {
                 switch (status)
                 {
@@ -1694,7 +1694,7 @@
                         return "r";
 
                 default:
-                        throw new MetacartaException("Bad status value: "+Integer.toString(status));
+                        throw new LCFException("Bad status value: "+Integer.toString(status));
                 }
         }
 
@@ -1703,11 +1703,11 @@
         *@return the type value.
         */
         public static int stringToType(String value)
-                throws MetacartaException
+                throws LCFException
         {
                 Integer x = (Integer)typeMap.get(value);
                 if (x == null)
-                        throw new MetacartaException("Bad type value: '"+value+"'");
+                        throw new LCFException("Bad type value: '"+value+"'");
                 return x.intValue();
         }
 
@@ -1716,7 +1716,7 @@
         *@return the string.
         */
         public static String typeToString(int type)
-                throws MetacartaException
+                throws LCFException
         {
                 switch (type)
                 {
@@ -1725,27 +1725,27 @@
                 case TYPE_SPECIFIED:
                         return "S";
                 default:
-                        throw new MetacartaException("Bad type: "+Integer.toString(type));
+                        throw new LCFException("Bad type: "+Integer.toString(type));
                 }
         }
 
         /** Go from string to hopcount mode.
         */
         public static int stringToHopcountMode(String value)
-                throws MetacartaException
+                throws LCFException
         {
                 if (value == null || value.length() == 0)
                         return HOPCOUNT_ACCURATE;
                 Integer x = (Integer)hopmodeMap.get(value);
                 if (x == null)
-                        throw new MetacartaException("Bad hopcount mode value: '"+value+"'");
+                        throw new LCFException("Bad hopcount mode value: '"+value+"'");
                 return x.intValue();
         }
 
         /** Go from hopcount mode to string.
         */
         public static String hopcountModeToString(int value)
-                throws MetacartaException
+                throws LCFException
         {
                 switch(value)
                 {
@@ -1756,7 +1756,7 @@
                 case HOPCOUNT_NEVERDELETE:
                         return "V";
                 default:
-                        throw new MetacartaException("Unknown hopcount mode value "+Integer.toString(value));
+                        throw new LCFException("Unknown hopcount mode value "+Integer.toString(value));
                 }
         }
 
@@ -1765,11 +1765,11 @@
         *@return the start method value.
         */
         public static int stringToStartMethod(String value)
-                throws MetacartaException
+                throws LCFException
         {
                 Integer x = (Integer)startMap.get(value);
                 if (x == null)
-                        throw new MetacartaException("Bad start method value: '"+value+"'");
+                        throw new LCFException("Bad start method value: '"+value+"'");
                 return x.intValue();
         }
 
@@ -1778,7 +1778,7 @@
         *@return a string.
         */
         public static String startMethodToString(int startMethod)
-                throws MetacartaException
+                throws LCFException
         {
                 switch(startMethod)
                 {
@@ -1789,7 +1789,7 @@
                 case START_DISABLE:
                         return "D";
                 default:
-                        throw new MetacartaException("Bad start method: "+Integer.toString(startMethod));
+                        throw new LCFException("Bad start method: "+Integer.toString(startMethod));
                 }
         }
 
@@ -1799,7 +1799,7 @@
         *@return the enumerated value.
         */
         public static EnumeratedValues stringToEnumeratedValue(String value)
-                throws MetacartaException
+                throws LCFException
         {
             if (value == null)
                 return null;
@@ -1825,7 +1825,7 @@
             }
             catch (NumberFormatException e)
             {
-                throw new MetacartaException("Bad number: '"+value+"'",e);
+                throw new LCFException("Bad number: '"+value+"'",e);
             }
 
         }
@@ -1878,7 +1878,7 @@
         *@return the corresponding job descriptions.
         */
         protected JobDescription[] getJobsMultiple(Long[] ids)
-                throws MetacartaException
+                throws LCFException
         {
                 // Fetch all the jobs, but only once for each ID.  Then, assign each one by id into the final array.
                 HashMap uniqueIDs = new HashMap();
@@ -1920,7 +1920,7 @@
                         signalRollback();
                         throw e;
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -1951,7 +1951,7 @@
         *@param params is the set of parameters.
         */
         protected void getJobsChunk(Map returnValues, String idList, ArrayList params)
-                throws MetacartaException
+                throws LCFException
         {
             try
             {
@@ -1992,7 +1992,7 @@
             }
             catch (NumberFormatException e)
             {
-                throw new MetacartaException("Bad number",e);
+                throw new LCFException("Bad number",e);
             }
         }
 
@@ -2099,7 +2099,7 @@
                 * @return the newly created objects to cache, or null, if any object cannot be created.
                 *  The order of the returned objects must correspond to the order of the object descriptinos.
                 */
-                public Object[] create(ICacheDescription[] objectDescriptions) throws MetacartaException
+                public Object[] create(ICacheDescription[] objectDescriptions) throws LCFException
                 {
                         // Turn the object descriptions into the parameters for the ToolInstance requests
                         Long[] ids = new Long[objectDescriptions.length];
@@ -2122,7 +2122,7 @@
                 * @param objectDescription is the unique identifier of the object.
                 * @param cachedObject is the cached object.
                 */
-                public void exists(ICacheDescription objectDescription, Object cachedObject) throws MetacartaException
+                public void exists(ICacheDescription objectDescription, Object cachedObject) throws LCFException
                 {
                         // Cast what came in as what it really is
                         JobObjectDescription objectDesc = (JobObjectDescription)objectDescription;
@@ -2138,7 +2138,7 @@
                 /** Perform the desired operation.  This method is called after either createGetObject()
                 * or exists() is called for every requested object.
                 */
-                public void execute() throws MetacartaException
+                public void execute() throws LCFException
                 {
                         // Does nothing; we only want to fetch objects in this cacher.
                 }

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/PrereqEventManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/PrereqEventManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/PrereqEventManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/PrereqEventManager.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
         *@param database is the database handle.
         */
         public PrereqEventManager(IDBInterface database)
-                throws MetacartaException
+                throws LCFException
         {
                 super(database,"prereqevents");
         }
@@ -58,7 +58,7 @@
         /** Install or upgrade this table.
         */
         public void install(String ownerTableName, String ownerColumn)
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
@@ -81,7 +81,7 @@
                                 // No upgrade is possible since this table has just been introduced.
                         }
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -100,14 +100,14 @@
         /** Uninstall.
         */
         public void deinstall()
-                throws MetacartaException
+                throws LCFException
         {
                 beginTransaction();
                 try
                 {
                         performDrop(null);
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         signalRollback();
                         throw e;
@@ -125,7 +125,7 @@
 
         /** Delete specified rows, based on jobqueue criteria. */
         public void deleteRows(String parentTableName, String joinField, String parentCriteria, ArrayList list)
-                throws MetacartaException
+                throws LCFException
         {
                 StringBuffer sb = new StringBuffer();
                 sb.append("WHERE EXISTS(SELECT 'x' FROM ").append(parentTableName).append(" WHERE ").append(joinField).append("=")
@@ -139,7 +139,7 @@
 
         /** Delete specified rows, as directly specified without a join. */
         public void deleteRows(String ownerQueryPart, ArrayList list)
-                throws MetacartaException
+                throws LCFException
         {
                 performDelete("WHERE "+ownerField+" IN("+ownerQueryPart+")",list,null);
                 reindexTracker.noteEvent();
@@ -147,7 +147,7 @@
         
         /** Delete rows pertaining to a single entry */
         public void deleteRows(Long recordID)
-                throws MetacartaException
+                throws LCFException
         {
                 ArrayList list = new ArrayList();
                 list.add(recordID);
@@ -157,7 +157,7 @@
         
         /** Add rows pertaining to a single entry */
         public void addRows(Long recordID, String[] eventNames)
-                throws MetacartaException
+                throws LCFException
         {
                 if (eventNames != null)
                 {
@@ -176,7 +176,7 @@
         /** Conditionally do analyze operation.
         */
         public void conditionallyMaintainTables()
-                throws MetacartaException
+                throws LCFException
         {
                 if (tracker.checkAction())
                 {

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/ScheduleManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/ScheduleManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/ScheduleManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/jobs/ScheduleManager.java Wed Feb 17 15:57:27 2010
@@ -48,7 +48,7 @@
 	*@param database is the database instance.
 	*/
 	public ScheduleManager(IThreadContext threadContext, IDBInterface database)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(database,"schedules");
 	}
@@ -58,7 +58,7 @@
 	*@param owningTablePrimaryKey is the primary key of the owning table.
 	*/
 	public void install(String ownerTable, String owningTablePrimaryKey)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -84,7 +84,7 @@
 				addTableIndex(false,list);
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -103,7 +103,7 @@
 	/** Uninstall.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
 		performDrop(null);
 	}
@@ -114,7 +114,7 @@
 	*@param ownerIDParams is the corresponding set of owner id parameters.
 	*/
 	public void getRows(Map returnValues, String ownerIDList, ArrayList ownerIDParams)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("SELECT * FROM "+getTableName()+" WHERE "+ownerIDField+" IN ("+ownerIDList+") ORDER BY "+ordinalField+" ASC",ownerIDParams,
 			null,null);
@@ -142,7 +142,7 @@
 	*@param ownerIDParams is the corresponding set of owner id parameters.
 	*/
 	public void getRowsAlternate(Map returnValues, String ownerIDList, ArrayList ownerIDParams)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("SELECT * FROM "+getTableName()+" WHERE "+ownerIDField+" IN ("+ownerIDList+") ORDER BY "+ordinalField+" ASC",ownerIDParams,
 			null,null);
@@ -175,7 +175,7 @@
 	*@param schedule is the schedule list.
 	*/
 	public void writeRows(Long ownerID, IJobDescription list)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -200,7 +200,7 @@
 				i++;
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -220,7 +220,7 @@
 	*@param ownerID is the owner whose rows to delete.
 	*/
 	public void deleteRows(Long ownerID)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList list = new ArrayList();
 		list.add(ownerID);
@@ -232,7 +232,7 @@
 	*@return the enumerated value.
 	*/
 	public static EnumeratedValues stringToEnumeratedValue(String value)
-		throws MetacartaException
+		throws LCFException
 	{
 	    if (value == null)
 		return null;
@@ -258,7 +258,7 @@
 	    }
 	    catch (NumberFormatException e)
 	    {
-		throw new MetacartaException("Bad number: '"+value+"'",e);
+		throw new LCFException("Bad number: '"+value+"'",e);
 	    }
 
 	}

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryConnectionManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryConnectionManager.java Wed Feb 17 15:57:27 2010
@@ -23,7 +23,7 @@
 import org.apache.lcf.crawler.interfaces.*;
 import org.apache.lcf.authorities.interfaces.*;
 import org.apache.lcf.crawler.interfaces.CacheKeyFactory;
-import org.apache.lcf.crawler.system.Metacarta;
+import org.apache.lcf.crawler.system.LCF;
 
 
 /** This class is the manager of the repository connection description.  Inside, multiple database tables are managed,
@@ -60,7 +60,7 @@
 	*@param threadContext is the thread context.
 	*/
 	public RepositoryConnectionManager(IThreadContext threadContext, IDBInterface database)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(database,"repoconnections");
 
@@ -73,7 +73,7 @@
 	/** Install the manager.
 	*/
 	public void install()
-		throws MetacartaException
+		throws LCFException
 	{
 		// First, get the authority manager table name and name column
 		IAuthorityConnectionManager authMgr = AuthorityConnectionManagerFactory.make(threadContext);
@@ -138,7 +138,7 @@
 			historyManager.install(getTableName(),nameField);
 			throttleSpecManager.install(getTableName(),nameField);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -157,7 +157,7 @@
 	/** Uninstall the manager.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -166,7 +166,7 @@
 			historyManager.deinstall();
 			performDrop(null);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -184,62 +184,62 @@
 
 	/** Export configuration */
 	public void exportConfiguration(java.io.OutputStream os)
-		throws java.io.IOException, MetacartaException
+		throws java.io.IOException, LCFException
 	{
 		// Write a version indicator
-		Metacarta.writeDword(os,1);
+		LCF.writeDword(os,1);
 		// Get the authority list
 		IRepositoryConnection[] list = getAllConnections();
 		// Write the number of authorities
-		Metacarta.writeDword(os,list.length);
+		LCF.writeDword(os,list.length);
 		// Loop through the list and write the individual repository connection info
 		int i = 0;
 		while (i < list.length)
 		{
 			IRepositoryConnection conn = list[i++];
-			Metacarta.writeString(os,conn.getName());
-			Metacarta.writeString(os,conn.getDescription());
-			Metacarta.writeString(os,conn.getClassName());
-			Metacarta.writeString(os,conn.getConfigParams().toXML());
-			Metacarta.writeString(os,conn.getACLAuthority());
-			Metacarta.writeDword(os,conn.getMaxConnections());
+			LCF.writeString(os,conn.getName());
+			LCF.writeString(os,conn.getDescription());
+			LCF.writeString(os,conn.getClassName());
+			LCF.writeString(os,conn.getConfigParams().toXML());
+			LCF.writeString(os,conn.getACLAuthority());
+			LCF.writeDword(os,conn.getMaxConnections());
 			String[] throttles = conn.getThrottles();
-			Metacarta.writeDword(os,throttles.length);
+			LCF.writeDword(os,throttles.length);
 			int j = 0;
 			while (j < throttles.length)
 			{
 				String throttleName = throttles[j++];
-				Metacarta.writeString(os,throttleName);
-				Metacarta.writeString(os,conn.getThrottleDescription(throttleName));
-				Metacarta.writefloat(os,conn.getThrottleValue(throttleName));
+				LCF.writeString(os,throttleName);
+				LCF.writeString(os,conn.getThrottleDescription(throttleName));
+				LCF.writefloat(os,conn.getThrottleValue(throttleName));
 			}
 		}
 	}
 	
 	/** Import configuration */
 	public void importConfiguration(java.io.InputStream is)
-		throws java.io.IOException, MetacartaException
+		throws java.io.IOException, LCFException
 	{
-		int version = Metacarta.readDword(is);
+		int version = LCF.readDword(is);
 		if (version != 1)
 			throw new java.io.IOException("Unknown repository connection configuration version: "+Integer.toString(version));
-		int count = Metacarta.readDword(is);
+		int count = LCF.readDword(is);
 		int i = 0;
 		while (i < count)
 		{
 			IRepositoryConnection conn = create();
-			conn.setName(Metacarta.readString(is));
-			conn.setDescription(Metacarta.readString(is));
-			conn.setClassName(Metacarta.readString(is));
-			conn.getConfigParams().fromXML(Metacarta.readString(is));
-			conn.setACLAuthority(Metacarta.readString(is));
-			conn.setMaxConnections(Metacarta.readDword(is));
-			int throttleCount = Metacarta.readDword(is);
+			conn.setName(LCF.readString(is));
+			conn.setDescription(LCF.readString(is));
+			conn.setClassName(LCF.readString(is));
+			conn.getConfigParams().fromXML(LCF.readString(is));
+			conn.setACLAuthority(LCF.readString(is));
+			conn.setMaxConnections(LCF.readDword(is));
+			int throttleCount = LCF.readDword(is);
 			int j = 0;
 			while (j < throttleCount)
 			{
-				String throttleName = Metacarta.readString(is);
-				conn.addThrottleValue(throttleName,Metacarta.readString(is),Metacarta.readfloat(is));
+				String throttleName = LCF.readString(is);
+				conn.addThrottleValue(throttleName,LCF.readString(is),LCF.readfloat(is));
 				j++;
 			}
 			// Attempt to save this connection
@@ -252,7 +252,7 @@
 	*@return an array of connection objects.
 	*/
 	public IRepositoryConnection[] getAllConnections()
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -273,7 +273,7 @@
 			}
 			return loadMultiple(names);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -294,7 +294,7 @@
 	*@return the loaded connection object, or null if not found.
 	*/
 	public IRepositoryConnection load(String name)
-		throws MetacartaException
+		throws LCFException
 	{
 		return loadMultiple(new String[]{name})[0];
 	}
@@ -304,7 +304,7 @@
 	*@return the loaded connection objects.
 	*/
 	public IRepositoryConnection[] loadMultiple(String[] names)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Build description objects
 		RepositoryConnectionDescription[] objectDescriptions = new RepositoryConnectionDescription[names.length];
@@ -327,7 +327,7 @@
 	*@return the new object.
 	*/
 	public IRepositoryConnection create()
-		throws MetacartaException
+		throws LCFException
 	{
 		RepositoryConnection rval = new RepositoryConnection();
 		return rval;
@@ -337,7 +337,7 @@
 	*@param object is the object to save.
 	*/
 	public void save(IRepositoryConnection object)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringSetBuffer ssb = new StringSetBuffer();
 		ssb.add(getRepositoryConnectionsKey());
@@ -351,7 +351,7 @@
 		    {
 			performLock();
 			// Notify of a change to the configuration
-			Metacarta.noteConfigurationChange();
+			LCF.noteConfigurationChange();
 			// See whether the instance exists
 			ArrayList params = new ArrayList();
 			params.add(object.getName());
@@ -385,7 +385,7 @@
 
 			cacheManager.invalidateKeys(ch);
 		    }
-		    catch (MetacartaException e)
+		    catch (LCFException e)
 		    {
 			signalRollback();
 			throw e;
@@ -411,7 +411,7 @@
 	* name does not exist, no error is returned.
 	*/
 	public void delete(String name)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Grab a job manager handle.  We will need to check if any jobs refer to this connection.
 		IJobManager jobManager = JobManagerFactory.make(threadContext);
@@ -428,8 +428,8 @@
 			{
 				// Check if any jobs refer to this connection name
 				if (jobManager.checkIfReference(name))
-					throw new MetacartaException("Can't delete repository connection '"+name+"': existing jobs refer to it");
-				Metacarta.noteConfigurationChange();
+					throw new LCFException("Can't delete repository connection '"+name+"': existing jobs refer to it");
+				LCF.noteConfigurationChange();
 				throttleSpecManager.deleteRows(name);
 				historyManager.deleteOwner(name,null);
 				ArrayList params = new ArrayList();
@@ -437,7 +437,7 @@
 				performDelete("WHERE "+nameField+"=?",params,null);
 				cacheManager.invalidateKeys(ch);
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				signalRollback();
 				throw e;
@@ -464,7 +464,7 @@
 	*@return true if referenced, false otherwise.
 	*/
 	public boolean isReferenced(String authorityName)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringSetBuffer ssb = new StringSetBuffer();
 		ssb.add(getRepositoryConnectionsKey());
@@ -481,7 +481,7 @@
 	*@return the repository connections that use that connector.
 	*/
 	public String[] findConnectionsForConnector(String className)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringSetBuffer ssb = new StringSetBuffer();
 		ssb.add(getRepositoryConnectionsKey());
@@ -507,7 +507,7 @@
 	*@return true if the underlying connector is registered.
 	*/
 	public boolean checkConnectorExists(String name)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -520,13 +520,13 @@
 			IResultSet set = performQuery("SELECT "+classNameField+" FROM "+getTableName()+" WHERE "+nameField+"=?",params,
 				localCacheKeys,null);
 			if (set.getRowCount() == 0)
-				throw new MetacartaException("No such connection: '"+name+"'");
+				throw new LCFException("No such connection: '"+name+"'");
 			IResultRow row = set.getRow(0);
 			String className = (String)row.getValue(classNameField);
 			IConnectorManager cm = ConnectorManagerFactory.make(threadContext);
 			return cm.isInstalled(className);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -578,7 +578,7 @@
 	*/
 	public void recordHistory(String connectionName, Long startTime, String activityType, Long dataSize,
 		String entityIdentifier, String resultCode, String resultDescription, String[] childIdentifiers)
-		throws MetacartaException
+		throws LCFException
 	{
 		long endTimeValue = System.currentTimeMillis();
 		long startTimeValue;
@@ -610,7 +610,7 @@
 	*@return the number of rows included by the criteria.
 	*/
 	public long countHistoryRows(String connectionName, FilterCriteria criteria)
-		throws MetacartaException
+		throws LCFException
 	{
 		return historyManager.countHistoryRows(connectionName,criteria);
 	}
@@ -626,7 +626,7 @@
 	*@param is the maximum number of rows to include.
 	*/
 	public IResultSet genHistorySimple(String connectionName, FilterCriteria criteria, SortOrder sort, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		return historyManager.simpleReport(connectionName,criteria,sort,startRow,maxRowCount);
 	}
@@ -649,7 +649,7 @@
 	*/
 	public IResultSet genHistoryActivityCount(String connectionName, FilterCriteria criteria, SortOrder sort, BucketDescription idBucket,
 		long interval, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		return historyManager.maxActivityCountReport(connectionName,criteria,sort,idBucket,interval,startRow,maxRowCount);
 	}
@@ -672,7 +672,7 @@
 	*/
 	public IResultSet genHistoryByteCount(String connectionName, FilterCriteria criteria, SortOrder sort, BucketDescription idBucket,
 		long interval, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		return historyManager.maxByteCountReport(connectionName,criteria,sort,idBucket,interval,startRow,maxRowCount);
 	}
@@ -694,7 +694,7 @@
 	*/
 	public IResultSet genHistoryResultCodes(String connectionName, FilterCriteria criteria, SortOrder sort,
 		BucketDescription resultCodeBucket, BucketDescription idBucket, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		return historyManager.resultCodesReport(connectionName,criteria,sort,resultCodeBucket,idBucket,startRow,maxRowCount);
 	}
@@ -726,7 +726,7 @@
 	*@return the corresponding repository connection objects.
 	*/
 	protected RepositoryConnection[] getRepositoryConnectionsMultiple(String[] connectionNames)
-		throws MetacartaException
+		throws LCFException
 	{
 		RepositoryConnection[] rval = new RepositoryConnection[connectionNames.length];
 		HashMap returnIndex = new HashMap();
@@ -770,7 +770,7 @@
 			signalRollback();
 			throw e;
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -788,7 +788,7 @@
 	*@param params is the set of parameters.
 	*/
 	protected void getRepositoryConnectionsChunk(RepositoryConnection[] rval, Map returnIndex, String idList, ArrayList params)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set;
 		set = performQuery("SELECT * FROM "+getTableName()+" WHERE "+
@@ -913,7 +913,7 @@
 		* @return the newly created objects to cache, or null, if any object cannot be created.
 		*  The order of the returned objects must correspond to the order of the object descriptinos.
 		*/
-		public Object[] create(ICacheDescription[] objectDescriptions) throws MetacartaException
+		public Object[] create(ICacheDescription[] objectDescriptions) throws LCFException
 		{
 			// Turn the object descriptions into the parameters for the ToolInstance requests
 			String[] connectionNames = new String[objectDescriptions.length];
@@ -936,7 +936,7 @@
 		* @param objectDescription is the unique identifier of the object.
 		* @param cachedObject is the cached object.
 		*/
-		public void exists(ICacheDescription objectDescription, Object cachedObject) throws MetacartaException
+		public void exists(ICacheDescription objectDescription, Object cachedObject) throws LCFException
 		{
 			// Cast what came in as what it really is
 			RepositoryConnectionDescription objectDesc = (RepositoryConnectionDescription)objectDescription;
@@ -954,7 +954,7 @@
 		/** Perform the desired operation.  This method is called after either createGetObject()
 		* or exists() is called for every requested object.
 		*/
-		public void execute() throws MetacartaException
+		public void execute() throws LCFException
 		{
 			// Does nothing; we only want to fetch objects in this cacher.
 		}

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryHistoryManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryHistoryManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryHistoryManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/RepositoryHistoryManager.java Wed Feb 17 15:57:27 2010
@@ -46,7 +46,7 @@
 	*@param database is the database instance.
 	*/
 	public RepositoryHistoryManager(IDBInterface database)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(database,"repohistory");
 	}
@@ -56,7 +56,7 @@
 	*@param parentField is the parent field.
 	*/
 	public void install(String parentTable, String parentField)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -92,7 +92,7 @@
 
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -111,7 +111,7 @@
 	/** Uninstall the table.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
 		performDrop(null);
 	}
@@ -121,7 +121,7 @@
 	*@param invKeys are the invalidation keys.
 	*/
 	public void deleteOwner(String owner, StringSet invKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList params = new ArrayList();
 		params.add(owner);
@@ -132,7 +132,7 @@
 	*/
 	public Long addRow(String connectionName, long startTime, long endTime, long dataSize, String activityType,
 		String entityIdentifier, String resultCode, String resultDescription)
-		throws MetacartaException
+		throws LCFException
 	{
 		Long id = new Long(IDFactory.make());
 		HashMap map = new HashMap();
@@ -228,7 +228,7 @@
 	* The resultset returned should have the following columns: "activity","starttime","elapsedtime","resultcode","resultdesc","bytes","identifier".
 	*/
 	public IResultSet simpleReport(String connectionName, FilterCriteria criteria, SortOrder sort, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Build the query.
 		StringBuffer sb = new StringBuffer("SELECT ");
@@ -250,14 +250,14 @@
 	*@return the number of rows included by the criteria.
 	*/
 	public long countHistoryRows(String connectionName, FilterCriteria criteria)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringBuffer sb = new StringBuffer("SELECT COUNT(*) AS countcol FROM ");
 		sb.append(getTableName());
 		addCriteria(sb,"",connectionName,criteria,false);
 		IResultSet set = performQuery(sb.toString(),null,null,null);
 		if (set.getRowCount() < 1)
-			throw new MetacartaException("Expected at least one row");
+			throw new LCFException("Expected at least one row");
 		IResultRow row = set.getRow(0);
 		Long value = (Long)row.getValue("countcol");
 		return value.longValue();
@@ -270,7 +270,7 @@
 	*/
 	public IResultSet maxActivityCountReport(String connectionName, FilterCriteria filterCriteria, SortOrder sort, BucketDescription idBucket,
 		long interval, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		// The query we will generate here looks like this:
 		// SELECT *
@@ -357,7 +357,7 @@
 	*/
 	public IResultSet maxByteCountReport(String connectionName, FilterCriteria filterCriteria, SortOrder sort, BucketDescription idBucket,
 		long interval, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		// The query we will generate here looks like this:
 		// SELECT *
@@ -445,7 +445,7 @@
 	*/
 	public IResultSet resultCodesReport(String connectionName, FilterCriteria filterCriteria, SortOrder sort,
 		BucketDescription resultCodeBucket, BucketDescription idBucket, int startRow, int maxRowCount)
-		throws MetacartaException
+		throws LCFException
 	{
 		// The query we'll use here will be:
 		//
@@ -625,7 +625,7 @@
 	/** Conditionally do analyze operation.
 	*/
 	protected void conditionallyAnalyzeInsert()
-		throws MetacartaException
+		throws LCFException
 	{
 		synchronized (tracker)
 		{

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/ThrottleSpecManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/ThrottleSpecManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/ThrottleSpecManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/repository/ThrottleSpecManager.java Wed Feb 17 15:57:27 2010
@@ -41,7 +41,7 @@
 	*@param database is the database instance.
 	*/
 	public ThrottleSpecManager(IDBInterface database)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(database,"throttlespec");
 	}
@@ -51,7 +51,7 @@
 	*@param owningTablePrimaryKey is the primary key of the owning table.
 	*/
 	public void install(String ownerTable, String owningTablePrimaryKey)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -72,7 +72,7 @@
 				addTableIndex(false,list);
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -91,7 +91,7 @@
 	/** Uninstall.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
 		performDrop(null);
 	}
@@ -101,7 +101,7 @@
 	*@param return a list, with columns: "description", "match", and "value".
 	*/
 	public IResultSet readRows(String name)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList list = new ArrayList();
 		list.add(name);
@@ -116,7 +116,7 @@
 	*@param ownerNameParams is the corresponding set of connection name parameters.
 	*/
 	public void getRows(IRepositoryConnection[] connections, Map indexMap, String ownerNameList, ArrayList ownerNameParams)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("SELECT * FROM "+getTableName()+" WHERE "+ownerNameField+" IN ("+ownerNameList+")",ownerNameParams,
 			null,null);
@@ -139,7 +139,7 @@
 	*@param connection is the connection to write throttle specs for.
 	*/
 	public void writeRows(String owner, IRepositoryConnection connection)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -161,7 +161,7 @@
 				performInsert(map,null);
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -181,7 +181,7 @@
 	*@param owner is the owner whose rows to delete.
 	*/
 	public void deleteRows(String owner)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList list = new ArrayList();
 		list.add(owner);

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/CrawlerAgent.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/CrawlerAgent.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/CrawlerAgent.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/CrawlerAgent.java Wed Feb 17 15:57:27 2010
@@ -34,7 +34,7 @@
 	*@param threadContext is the thread context.
 	*/
 	public CrawlerAgent(IThreadContext threadContext)
-		throws MetacartaException
+		throws LCFException
 	{
 		this.threadContext = threadContext;
 	}
@@ -42,38 +42,38 @@
 	/** Install agent.  This usually installs the agent's database tables etc.
 	*/
 	public void install()
-		throws MetacartaException
+		throws LCFException
 	{
 		// Install the system tables for the crawler.
-		Metacarta.initializeEnvironment();
-		Metacarta.installSystemTables(threadContext);
+		LCF.initializeEnvironment();
+		LCF.installSystemTables(threadContext);
 	}
 
 	/** Uninstall agent.  This must clean up everything the agent is responsible for.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
-		Metacarta.initializeEnvironment();
-		Metacarta.deinstallSystemTables(threadContext);
+		LCF.initializeEnvironment();
+		LCF.deinstallSystemTables(threadContext);
 	}
 
 	/** Start the agent.  This method should spin up the agent threads, and
 	* then return.
 	*/
 	public void startAgent()
-		throws MetacartaException
+		throws LCFException
 	{
-		Metacarta.initializeEnvironment();
-		Metacarta.startSystem(threadContext);
+		LCF.initializeEnvironment();
+		LCF.startSystem(threadContext);
 	}
 
 	/** Stop the agent.  This should shut down the agent threads.
 	*/
 	public void stopAgent()
-		throws MetacartaException
+		throws LCFException
 	{
-		Metacarta.stopSystem(threadContext);
+		LCF.stopSystem(threadContext);
 	}
 
 	/** Request permission from agent to delete an output connection.
@@ -81,27 +81,27 @@
 	*@return true if the connection is in use, false otherwise.
 	*/
 	public boolean isOutputConnectionInUse(String connName)
-		throws MetacartaException
+		throws LCFException
 	{
-		return Metacarta.isOutputConnectionInUse(threadContext,connName);
+		return LCF.isOutputConnectionInUse(threadContext,connName);
 	}
 		
 	/** 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 MetacartaException
+		throws LCFException
 	{
-		Metacarta.noteOutputConnectorDeregistration(threadContext,connectionNames);
+		LCF.noteOutputConnectorDeregistration(threadContext,connectionNames);
 	}
 		
 	/** 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 MetacartaException
+		throws LCFException
 	{
-		Metacarta.noteOutputConnectorRegistration(threadContext,connectionNames);
+		LCF.noteOutputConnectorRegistration(threadContext,connectionNames);
 	}
 
 }

Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/DocDeleteResetManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/DocDeleteResetManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/DocDeleteResetManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/system/DocDeleteResetManager.java Wed Feb 17 15:57:27 2010
@@ -42,7 +42,7 @@
 
 	/** Reset */
 	protected void performResetLogic(IThreadContext tc)
-		throws MetacartaException
+		throws LCFException
 	{
 		IJobManager jobManager = JobManagerFactory.make(tc);
 		jobManager.resetDocDeleteWorkerStatus();



Mime
View raw message