incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1004255 [9/24] - in /incubator/lcf/trunk: modules/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf...
Date Mon, 04 Oct 2010 14:32:28 GMT
Modified: incubator/lcf/trunk/modules/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java Mon Oct  4 14:32:19 2010
@@ -22,7 +22,7 @@ import org.apache.manifoldcf.core.interf
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
 import org.apache.manifoldcf.crawler.system.Logging;
-import org.apache.manifoldcf.crawler.system.ACF;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
 
 import org.xml.sax.Attributes;
 
@@ -219,13 +219,13 @@ public class WebcrawlerConnector extends
   *@param threadContext is the current thread context.
   */
   public void install(IThreadContext threadContext)
-    throws ACFException
+    throws ManifoldCFException
   {
     // Install
     IDBInterface mainDatabase = DBInterfaceFactory.make(threadContext,
-      ACF.getMasterDatabaseName(),
-      ACF.getMasterDatabaseUsername(),
-      ACF.getMasterDatabasePassword());
+      ManifoldCF.getMasterDatabaseName(),
+      ManifoldCF.getMasterDatabaseUsername(),
+      ManifoldCF.getMasterDatabasePassword());
 
     RobotsManager rm = new RobotsManager(threadContext,mainDatabase);
     DNSManager dns = new DNSManager(threadContext,mainDatabase);
@@ -237,7 +237,7 @@ public class WebcrawlerConnector extends
       dns.install();
       cm.install();
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       mainDatabase.signalRollback();
       throw e;
@@ -260,13 +260,13 @@ public class WebcrawlerConnector extends
   *@param threadContext is the current thread context.
   */
   public void deinstall(IThreadContext threadContext)
-    throws ACFException
+    throws ManifoldCFException
   {
     // Uninstall
     IDBInterface mainDatabase = DBInterfaceFactory.make(threadContext,
-      ACF.getMasterDatabaseName(),
-      ACF.getMasterDatabaseUsername(),
-      ACF.getMasterDatabasePassword());
+      ManifoldCF.getMasterDatabaseName(),
+      ManifoldCF.getMasterDatabaseUsername(),
+      ManifoldCF.getMasterDatabasePassword());
 
     RobotsManager rm = new RobotsManager(threadContext,mainDatabase);
     DNSManager dns = new DNSManager(threadContext,mainDatabase);
@@ -278,7 +278,7 @@ public class WebcrawlerConnector extends
       rm.deinstall();
       dns.deinstall();
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       mainDatabase.signalRollback();
       throw e;
@@ -324,15 +324,15 @@ public class WebcrawlerConnector extends
 
   /** Start a session */
   protected void getSession()
-    throws ACFException
+    throws ManifoldCFException
   {
     // Handle the stuff that requires a thread context
     if (robotsManager == null || dnsManager == null || cookieManager == null)
     {
       IDBInterface databaseHandle = DBInterfaceFactory.make(currentContext,
-        ACF.getMasterDatabaseName(),
-        ACF.getMasterDatabaseUsername(),
-        ACF.getMasterDatabasePassword());
+        ManifoldCF.getMasterDatabaseName(),
+        ManifoldCF.getMasterDatabaseUsername(),
+        ManifoldCF.getMasterDatabasePassword());
 
       robotsManager = new RobotsManager(currentContext,databaseHandle);
       dnsManager = new DNSManager(currentContext,databaseHandle);
@@ -346,8 +346,8 @@ public class WebcrawlerConnector extends
 
       String emailAddress = params.getParameter(WebcrawlerConfig.PARAMETER_EMAIL);
       if (emailAddress == null)
-        throw new ACFException("Missing email address");
-      userAgent = "ApacheACFWebCrawler; "+emailAddress+")";
+        throw new ManifoldCFException("Missing email address");
+      userAgent = "ApacheManifoldCFWebCrawler; "+emailAddress+")";
       from = emailAddress;
 
       x = params.getParameter(WebcrawlerConfig.PARAMETER_ROBOTSUSAGE);
@@ -374,7 +374,7 @@ public class WebcrawlerConnector extends
   * in active use.
   */
   public void poll()
-    throws ACFException
+    throws ManifoldCFException
   {
     ThrottledFetcher.flushIdleConnections();
   }
@@ -382,7 +382,7 @@ public class WebcrawlerConnector extends
   /** Check status of connection.
   */
   public String check()
-    throws ACFException
+    throws ManifoldCFException
   {
     getSession();
     return super.check();
@@ -391,7 +391,7 @@ public class WebcrawlerConnector extends
   /** Close the connection.  Call this before discarding the repository connector.
   */
   public void disconnect()
-    throws ACFException
+    throws ManifoldCFException
   {
     throttleDescription = null;
     credentialsDescription = null;
@@ -453,7 +453,7 @@ public class WebcrawlerConnector extends
   */
   public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
     long startTime, long endTime)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     getSession();
 
@@ -521,7 +521,7 @@ public class WebcrawlerConnector extends
   */
   public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     getSession();
 
@@ -723,7 +723,7 @@ public class WebcrawlerConnector extends
                         activityResultCode = null;
                       }
                     }
-                    catch (ACFException e)
+                    catch (ManifoldCFException e)
                     {
                       connection.noteInterrupted(e);
                       throw e;
@@ -1072,7 +1072,7 @@ public class WebcrawlerConnector extends
             rval[i] = null;
             break;
           default:
-            throw new ACFException("Unexpected value for result signal: "+Integer.toString(resultSignal));
+            throw new ManifoldCFException("Unexpected value for result signal: "+Integer.toString(resultSignal));
           }
         }
         finally
@@ -1109,7 +1109,7 @@ public class WebcrawlerConnector extends
   * 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 ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     getSession();
 
@@ -1225,20 +1225,20 @@ public class WebcrawlerConnector extends
               }
               catch (java.net.SocketException e)
               {
-                throw new ACFException("Socket timeout error closing stream: "+e.getMessage(),e);
+                throw new ManifoldCFException("Socket timeout error closing stream: "+e.getMessage(),e);
               }
               catch (org.apache.commons.httpclient.ConnectTimeoutException e)
               {
-                throw new ACFException("Socket connect timeout error closing stream: "+e.getMessage(),e);
+                throw new ManifoldCFException("Socket connect timeout error closing stream: "+e.getMessage(),e);
               }
               catch (InterruptedIOException e)
               {
                 //Logging.connectors.warn("IO interruption seen",e);
-                throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+                throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
               }
               catch (IOException e)
               {
-                throw new ACFException("IO error closing stream: "+e.getMessage(),e);
+                throw new ManifoldCFException("IO error closing stream: "+e.getMessage(),e);
               }
             }
           }
@@ -1268,7 +1268,7 @@ public class WebcrawlerConnector extends
   *@param versions is the corresponding set of version identifiers (individual identifiers may be null).
   */
   public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
-    throws ACFException
+    throws ManifoldCFException
   {
     int i = 0;
     while (i < documentIdentifiers.length)
@@ -1309,7 +1309,7 @@ public class WebcrawlerConnector extends
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     tabsArray.add("Email");
     tabsArray.add("Robots");
@@ -1640,7 +1640,7 @@ public class WebcrawlerConnector extends
   *@param tabName is the current tab name.
   */
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     
     String email = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.PARAMETER_EMAIL);
@@ -1961,7 +1961,7 @@ public class WebcrawlerConnector extends
             if (domain == null)
               domain = "";
             String userName = cn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_USERNAME);
-            String password = org.apache.manifoldcf.crawler.system.ACF.deobfuscate(cn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD));
+            String password = org.apache.manifoldcf.crawler.system.ManifoldCF.deobfuscate(cn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD));
                                         
             // It's prefix will be...
             String prefix = "acredential_" + Integer.toString(accessCounter);
@@ -2155,7 +2155,7 @@ public class WebcrawlerConnector extends
 "                        <nobr><input type=\"text\" size=\"15\" name=\""+authParamPrefix+"_value"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)+"\"/></nobr>\n"+
 "                      </td>\n"+
 "                      <td class=\"formcolumncell\">\n"+
-"                        <nobr><input type=\"password\" size=\"15\" name=\""+authParamPrefix+"_password"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(org.apache.manifoldcf.crawler.system.ACF.deobfuscate(password))+"\"/></nobr>\n"+
+"                        <nobr><input type=\"password\" size=\"15\" name=\""+authParamPrefix+"_password"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(org.apache.manifoldcf.crawler.system.ManifoldCF.deobfuscate(password))+"\"/></nobr>\n"+
 "                      </td>\n"+
 "                    </tr>\n"
                       );
@@ -2282,7 +2282,7 @@ public class WebcrawlerConnector extends
             if (domain == null)
               domain = "";
             String userName = cn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_USERNAME);
-            String password = org.apache.manifoldcf.crawler.system.ACF.deobfuscate(cn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD));
+            String password = org.apache.manifoldcf.crawler.system.ManifoldCF.deobfuscate(cn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD));
 
             // It's prefix will be...
             String prefix = "acredential_" + Integer.toString(accessCounter);
@@ -2360,7 +2360,7 @@ public class WebcrawlerConnector extends
                       out.print(
 "<input type=\"hidden\" name=\""+authParamPrefix+"_param"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(param)+"\"/>\n"+
 "<input type=\"hidden\" name=\""+authParamPrefix+"_value"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)+"\"/>\n"+
-"<input type=\"hidden\" name=\""+authParamPrefix+"_password"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(org.apache.manifoldcf.crawler.system.ACF.deobfuscate(password))+"\"/>\n"
+"<input type=\"hidden\" name=\""+authParamPrefix+"_password"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(org.apache.manifoldcf.crawler.system.ManifoldCF.deobfuscate(password))+"\"/>\n"
                       );
                       paramCounter++;
                     }
@@ -2559,7 +2559,7 @@ public class WebcrawlerConnector extends
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
-    throws ACFException
+    throws ManifoldCFException
   {
     String email = variableContext.getParameter("email");
     if (email != null)
@@ -2691,7 +2691,7 @@ public class WebcrawlerConnector extends
           node.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_DOMAIN,domain);
           node.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_USERNAME,userName);
           node.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD,
-            org.apache.manifoldcf.crawler.system.ACF.obfuscate(password));
+            org.apache.manifoldcf.crawler.system.ManifoldCF.obfuscate(password));
           parameters.addChild(parameters.getChildCount(),node);
         }
         i++;
@@ -2710,7 +2710,7 @@ public class WebcrawlerConnector extends
         node.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_DOMAIN,domain);
         node.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_USERNAME,userName);
         node.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD,
-          org.apache.manifoldcf.crawler.system.ACF.obfuscate(password));
+          org.apache.manifoldcf.crawler.system.ManifoldCF.obfuscate(password));
         parameters.addChild(parameters.getChildCount(),node);
       }
     }
@@ -2779,7 +2779,7 @@ public class WebcrawlerConnector extends
                     if (value != null && value.length() > 0)
                       paramNode.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_VALUE,value);
                     if (password != null && password.length() > 0)
-                      paramNode.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD,org.apache.manifoldcf.crawler.system.ACF.obfuscate(password));
+                      paramNode.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD,org.apache.manifoldcf.crawler.system.ManifoldCF.obfuscate(password));
                     authPageNode.addChild(authPageNode.getChildCount(),paramNode);
                   }
                   z++;
@@ -2797,7 +2797,7 @@ public class WebcrawlerConnector extends
                   if (value != null && value.length() > 0)
                     paramNode.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_VALUE,value);
                   if (password != null && password.length() > 0)
-                    paramNode.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD,org.apache.manifoldcf.crawler.system.ACF.obfuscate(password));
+                    paramNode.setAttribute(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTR_PASSWORD,org.apache.manifoldcf.crawler.system.ManifoldCF.obfuscate(password));
                   authPageNode.addChild(authPageNode.getChildCount(),paramNode);
                 }
               }
@@ -2934,7 +2934,7 @@ public class WebcrawlerConnector extends
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     String email = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.PARAMETER_EMAIL);
     String robots = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.PARAMETER_ROBOTSUSAGE);
@@ -3268,7 +3268,7 @@ public class WebcrawlerConnector extends
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, ArrayList tabsArray)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     tabsArray.add("Seeds");
     tabsArray.add("Canonicalization");
@@ -3381,7 +3381,7 @@ public class WebcrawlerConnector extends
   *@param tabName is the current tab name.
   */
   public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     int i;
     int k;
@@ -3847,7 +3847,7 @@ public class WebcrawlerConnector extends
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
   public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification ds)
-    throws ACFException
+    throws ManifoldCFException
   {
     // Get the seeds
     String seeds = variableContext.getParameter("seeds");
@@ -4120,7 +4120,7 @@ public class WebcrawlerConnector extends
   *@param ds is the current document specification for this job.
   */
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     int j;
     boolean seenAny;
@@ -4199,7 +4199,7 @@ public class WebcrawlerConnector extends
     }
     catch (java.io.IOException e)
     {
-      throw new ACFException("IO error: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO error: "+e.getMessage(),e);
     }
     out.print(
 "    </td>\n"+
@@ -4327,7 +4327,7 @@ public class WebcrawlerConnector extends
     }
     catch (java.io.IOException e)
     {
-      throw new ACFException("IO error: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO error: "+e.getMessage(),e);
     }
     out.print(
 "    </td>\n"+
@@ -4369,7 +4369,7 @@ public class WebcrawlerConnector extends
     }
     catch (java.io.IOException e)
     {
-      throw new ACFException("IO error: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO error: "+e.getMessage(),e);
     }
     out.print(
 "    </td>\n"+
@@ -4481,7 +4481,7 @@ public class WebcrawlerConnector extends
   *@return appropriate status.
   */
   protected int lookupIPAddress(String documentIdentifier, IVersionActivity activities, String hostName, long currentTime, StringBuffer ipAddressBuffer)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     String eventName = makeDNSEventName(activities,hostName);
     DNSManager.DNSInfo info = dnsManager.lookup(hostName,currentTime);
@@ -4559,7 +4559,7 @@ public class WebcrawlerConnector extends
   */
   protected int checkFetchAllowed(String documentIdentifier, String protocol, String hostIPAddress, int port, PageCredentials credential,
     IKeystoreManager trustStore, String hostName, String[] binNames, long currentTime, String pathString, IVersionActivity versionActivities, int connectionLimit)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     // hostNameAndPort is the key for looking up the robots file in the database
     String hostNameAndPort = makeRobotsKey(protocol,hostName,port);
@@ -4655,7 +4655,7 @@ public class WebcrawlerConnector extends
             catch (InterruptedIOException e2)
             {
               //Logging.connectors.warn("IO interruption seen",e2);
-              throw new ACFException("Interrupted: "+e2.getMessage(),e2,ACFException.INTERRUPTED);
+              throw new ManifoldCFException("Interrupted: "+e2.getMessage(),e2,ManifoldCFException.INTERRUPTED);
             }
             catch (IOException e2)
             {
@@ -4683,7 +4683,7 @@ public class WebcrawlerConnector extends
             catch (InterruptedIOException e2)
             {
               //Logging.connectors.warn("IO interruption seen",e2);
-              throw new ACFException("Interrupted: "+e2.getMessage(),e2,ACFException.INTERRUPTED);
+              throw new ManifoldCFException("Interrupted: "+e2.getMessage(),e2,ManifoldCFException.INTERRUPTED);
             }
             catch (IOException e2)
             {
@@ -4693,7 +4693,7 @@ public class WebcrawlerConnector extends
           catch (InterruptedIOException e)
           {
             //Logging.connectors.warn("IO interruption seen",e);
-            throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
           }
           catch (IOException e)
           {
@@ -4716,7 +4716,7 @@ public class WebcrawlerConnector extends
             catch (InterruptedIOException e2)
             {
               //Logging.connectors.warn("IO interruption seen",e2);
-              throw new ACFException("Interrupted: "+e2.getMessage(),e2,ACFException.INTERRUPTED);
+              throw new ManifoldCFException("Interrupted: "+e2.getMessage(),e2,ManifoldCFException.INTERRUPTED);
             }
             catch (IOException e2)
             {
@@ -4763,7 +4763,7 @@ public class WebcrawlerConnector extends
   *@return the canonical URL (the document identifier), or null if the url was illegal.
   */
   protected String makeDocumentIdentifier(String parentIdentifier, String rawURL, DocumentURLFilter filter)
-    throws ACFException
+    throws ManifoldCFException
   {
     try
     {
@@ -4849,7 +4849,7 @@ public class WebcrawlerConnector extends
   /** Code to canonicalize a URL.  If URL cannot be canonicalized (and is illegal) return null.
   */
   protected String doCanonicalization(DocumentURLFilter filter, java.net.URI url)
-    throws ACFException, java.net.URISyntaxException
+    throws ManifoldCFException, java.net.URISyntaxException
   {
     // First, we have to figure out what the canonicalization policy is.
     // To do that, we need to do a regexp match against the COMPLETE raw url.
@@ -5064,7 +5064,7 @@ public class WebcrawlerConnector extends
   /** Code to check if data is interesting, based on response code and content type.
   */
   protected boolean isContentInteresting(IFingerprintActivity activities, String documentIdentifier, int response, String contentType)
-    throws ServiceInterruption, ACFException
+    throws ServiceInterruption, ManifoldCFException
   {
     // Additional filtering only done if it's a 200 response
     if (response != 200)
@@ -5094,7 +5094,7 @@ public class WebcrawlerConnector extends
   /** Code to check if an already-fetched document should be ingested.
   */
   protected boolean isDataIngestable(IFingerprintActivity activities, String documentIdentifier)
-    throws ServiceInterruption, ACFException
+    throws ServiceInterruption, ManifoldCFException
   {
     if (cache.getResponseCode(documentIdentifier) != 200)
       return false;
@@ -5125,7 +5125,7 @@ public class WebcrawlerConnector extends
 
   /** Find a redirection URI, if it exists */
   protected String findRedirectionURI(String currentURI)
-    throws ACFException
+    throws ManifoldCFException
   {
     FindRedirectionHandler handler = new FindRedirectionHandler(currentURI);
     handleRedirects(currentURI,handler);
@@ -5134,7 +5134,7 @@ public class WebcrawlerConnector extends
 
   /** Find matching HTML form data, if present.  Return null if not. */
   protected FormData findHTMLForm(String currentURI, LoginParameters lp)
-    throws ACFException
+    throws ManifoldCFException
   {
     if (lp == null || lp.getFormNamePattern() == null)
       return null;
@@ -5152,7 +5152,7 @@ public class WebcrawlerConnector extends
 
   /** Find a preferred redirection URI, if it exists */
   protected String findPreferredRedirectionURI(String currentURI, LoginParameters lp)
-    throws ACFException
+    throws ManifoldCFException
   {
     if (lp == null || lp.getPreferredRedirectionPattern() == null)
       return null;
@@ -5164,7 +5164,7 @@ public class WebcrawlerConnector extends
 
   /** Find HTML link URI, if present, making sure specified preference is matched. */
   protected String findHTMLLinkURI(String currentURI, LoginParameters lp)
-    throws ACFException
+    throws ManifoldCFException
   {
     if (lp == null || lp.getPreferredLinkPattern() == null)
       return null;
@@ -5197,7 +5197,7 @@ public class WebcrawlerConnector extends
 
     /** Override noteDiscoveredLink */
     public void noteDiscoveredLink(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (targetURI == null)
       {
@@ -5252,7 +5252,7 @@ public class WebcrawlerConnector extends
 
     /** Note the start of a form */
     public void noteFormStart(Map formAttributes)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (Logging.connectors.isDebugEnabled())
         Logging.connectors.debug("WEB: Saw form with name "+((formAttributes.get("name")==null)?"null":"'"+formAttributes.get("name")+"'"));
@@ -5298,7 +5298,7 @@ public class WebcrawlerConnector extends
 
     /** Note an input tag */
     public void noteFormInput(Map inputAttributes)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (Logging.connectors.isDebugEnabled())
         Logging.connectors.debug("WEB: Saw form element of type '"+inputAttributes.get("type")+"' name '"+inputAttributes.get("name")+"'");
@@ -5308,7 +5308,7 @@ public class WebcrawlerConnector extends
 
     /** Note the end of a form */
     public void noteFormEnd()
-      throws ACFException
+      throws ManifoldCFException
     {
       if (currentFormData != null)
       {
@@ -5319,25 +5319,25 @@ public class WebcrawlerConnector extends
 
     /** Note discovered href */
     public void noteAHREF(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note discovered href */
     public void noteLINKHREF(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note discovered IMG SRC */
     public void noteIMGSRC(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note discovered FRAME SRC */
     public void noteFRAMESRC(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
@@ -5634,25 +5634,25 @@ public class WebcrawlerConnector extends
 
     /** Note the start of a form */
     public void noteFormStart(Map formAttributes)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note an input tag */
     public void noteFormInput(Map inputAttributes)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note the end of a form */
     public void noteFormEnd()
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Override noteDiscoveredLink */
     public void noteDiscoveredLink(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (targetURI == null)
       {
@@ -5682,27 +5682,27 @@ public class WebcrawlerConnector extends
 
     /** Note discovered href */
     public void noteAHREF(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
 
     /** Note discovered href */
     public void noteLINKHREF(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
 
     /** Note discovered IMG SRC */
     public void noteIMGSRC(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note discovered FRAME SRC */
     public void noteFRAMESRC(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
@@ -5724,7 +5724,7 @@ public class WebcrawlerConnector extends
     *@param rawURL is the raw discovered url.  This may be relative, malformed, or otherwise unsuitable for use until final form is acheived.
     */
     public void noteDiscoveredLink(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       // Build a complete url, but don't filter or anything
       try
@@ -5795,7 +5795,7 @@ public class WebcrawlerConnector extends
 
   /** Code to extract links from an already-fetched document. */
   protected void extractLinks(String documentIdentifier, IProcessActivity activities, DocumentURLFilter filter)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     handleRedirects(documentIdentifier,new ProcessActivityRedirectionHandler(documentIdentifier,activities,filter));
     // For html, we don't want any actions, because we don't do form submission.
@@ -5828,7 +5828,7 @@ public class WebcrawlerConnector extends
     *@param rawURL is the raw discovered url.  This may be relative, malformed, or otherwise unsuitable for use until final form is acheived.
     */
     public void noteDiscoveredLink(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       String newIdentifier = makeDocumentIdentifier(documentIdentifier,rawURL,filter);
       if (newIdentifier != null)
@@ -5867,46 +5867,46 @@ public class WebcrawlerConnector extends
 
     /** Note the start of a form */
     public void noteFormStart(Map formAttributes)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note an input tag */
     public void noteFormInput(Map inputAttributes)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note the end of a form */
     public void noteFormEnd()
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     /** Note discovered href */
     public void noteAHREF(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
 
     /** Note discovered href */
     public void noteLINKHREF(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
 
     /** Note discovered IMG SRC */
     public void noteIMGSRC(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
 
     /** Note discovered FRAME SRC */
     public void noteFRAMESRC(String rawURL)
-      throws ACFException
+      throws ManifoldCFException
     {
       noteDiscoveredLink(rawURL);
     }
@@ -5926,7 +5926,7 @@ public class WebcrawlerConnector extends
     *@param rawTtlValue is the raw discovered ttl value.  Null indicates we should set the default.
     */
     public void noteDiscoveredTtlValue(String rawTtlValue)
-      throws ACFException
+      throws ManifoldCFException
     {
       long currentTime = System.currentTimeMillis();
       Long rescanTime = null;
@@ -5957,7 +5957,7 @@ public class WebcrawlerConnector extends
 
   /** Handle extracting the redirect link from a redirect response. */
   protected void handleRedirects(String documentURI, IRedirectionHandler handler)
-    throws ACFException
+    throws ManifoldCFException
   {
     int responseCode = cache.getResponseCode(documentURI);
     if (responseCode == 302 || responseCode == 301)
@@ -5979,7 +5979,7 @@ public class WebcrawlerConnector extends
 
   /** Handle document references from XML.  Right now we only understand RSS. */
   protected void handleXML(String documentURI, IXMLHandler handler)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     try
     {
@@ -6056,7 +6056,7 @@ public class WebcrawlerConnector extends
           x.cleanup();
         }
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         // Ignore XML parsing errors.  These should probably have their own error code, but that requires a core change.
         if (e.getMessage().indexOf("pars") >= 0)
@@ -6074,21 +6074,21 @@ public class WebcrawlerConnector extends
     }
     catch (java.net.SocketTimeoutException e)
     {
-      throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
     }
     catch (org.apache.commons.httpclient.ConnectTimeoutException e)
     {
-      throw new ACFException("Socket connect timeout exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket connect timeout exception: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
       //Logging.connectors.warn("IO interruption seen",e);
 
-      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+      throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new ACFException("IO error: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO error: "+e.getMessage(),e);
     }
   }
 
@@ -6121,7 +6121,7 @@ public class WebcrawlerConnector extends
 
     /** Handle the tag beginning to set the correct second-level parsing context */
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       if (qName.equals("rss"))
       {
@@ -6150,7 +6150,7 @@ public class WebcrawlerConnector extends
 
     /** Handle the tag ending */
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       XMLContext context = theStream.getContext();
       String tagName = context.getQname();
@@ -6183,7 +6183,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // Handle each channel
       if (qName.equals("channel"))
@@ -6197,7 +6197,7 @@ public class WebcrawlerConnector extends
     }
 
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // If it's our channel tag, process global channel information
       XMLContext context = theStream.getContext();
@@ -6229,7 +6229,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // The tags we care about are "ttl" and "item", nothing else.
       if (qName.equals("ttl"))
@@ -6247,7 +6247,7 @@ public class WebcrawlerConnector extends
     }
 
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       XMLContext theContext = theStream.getContext();
       String theTag = theContext.getQname();
@@ -6277,7 +6277,7 @@ public class WebcrawlerConnector extends
 
     /** Process this data */
     protected void process()
-      throws ACFException
+      throws ManifoldCFException
     {
       // Deal with the ttlvalue, if it was found
       // Use the ttl value as a signal for when we ought to look at this feed again.  If not present, use the default.
@@ -6296,7 +6296,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // The tags we care about are "ttl" and "item", nothing else.
       if (qName.equals("link"))
@@ -6318,7 +6318,7 @@ public class WebcrawlerConnector extends
 
     /** Convert the individual sub-fields of the item context into their final forms */
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       XMLContext theContext = theStream.getContext();
       String theTag = theContext.getQname();
@@ -6338,7 +6338,7 @@ public class WebcrawlerConnector extends
 
     /** Process the data accumulated for this item */
     public void process(IXMLHandler handler)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (linkField == null || linkField.length() == 0)
         linkField = guidField;
@@ -6375,7 +6375,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // The tags we care about are "ttl" and "item", nothing else.
       if (qName.equals("ttl"))
@@ -6393,7 +6393,7 @@ public class WebcrawlerConnector extends
     }
 
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       XMLContext theContext = theStream.getContext();
       String theTag = theContext.getQname();
@@ -6420,7 +6420,7 @@ public class WebcrawlerConnector extends
 
     /** Process this data */
     protected void process()
-      throws ACFException
+      throws ManifoldCFException
     {
       // Deal with the ttlvalue, if it was found
       handler.noteDiscoveredTtlValue(ttlValue);
@@ -6437,7 +6437,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // The tags we care about are "ttl" and "item", nothing else.
       if (qName.equals("link"))
@@ -6454,7 +6454,7 @@ public class WebcrawlerConnector extends
 
     /** Convert the individual sub-fields of the item context into their final forms */
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       XMLContext theContext = theStream.getContext();
       String theTag = theContext.getQname();
@@ -6470,7 +6470,7 @@ public class WebcrawlerConnector extends
 
     /** Process the data accumulated for this item */
     public void process(IXMLHandler handler)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (linkField != null && linkField.length() > 0)
       {
@@ -6504,7 +6504,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // The tags we care about are "ttl" and "item", nothing else.
       if (qName.equals("ttl"))
@@ -6522,7 +6522,7 @@ public class WebcrawlerConnector extends
     }
 
     protected void endTag()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       XMLContext theContext = theStream.getContext();
       String theTag = theContext.getQname();
@@ -6549,7 +6549,7 @@ public class WebcrawlerConnector extends
 
     /** Process this data */
     protected void process()
-      throws ACFException
+      throws ManifoldCFException
     {
       // Deal with the ttlvalue, if it was found
       // Use the ttl value as a signal for when we ought to look at this feed again.  If not present, use the default.
@@ -6567,7 +6567,7 @@ public class WebcrawlerConnector extends
     }
 
     protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       // The tags we care about are "ttl" and "item", nothing else.
       if (qName.equals("link"))
@@ -6585,7 +6585,7 @@ public class WebcrawlerConnector extends
 
     /** Process the data accumulated for this item */
     public void process(IXMLHandler handler)
-      throws ACFException
+      throws ManifoldCFException
     {
       if (linkField != null && linkField.length() > 0)
       {
@@ -6603,7 +6603,7 @@ public class WebcrawlerConnector extends
 
   /** Handle document references from HTML */
   protected void handleHTML(String documentURI, IHTMLHandler handler)
-    throws ACFException
+    throws ManifoldCFException
   {
     int responseCode = cache.getResponseCode(documentURI);
     if (responseCode != 200)
@@ -6693,27 +6693,27 @@ public class WebcrawlerConnector extends
     }
     catch (SocketTimeoutException e)
     {
-      throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
     }
     catch (org.apache.commons.httpclient.ConnectTimeoutException e)
     {
-      throw new ACFException("Socket connect timeout exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket connect timeout exception: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
       //Logging.connectors.warn("IO interruption seen",e);
 
-      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+      throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new ACFException("IO error: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO error: "+e.getMessage(),e);
     }
   }
 
   /** Is the document text, as far as we can tell? */
   protected boolean isDocumentText(String documentURI)
-    throws ACFException
+    throws ManifoldCFException
   {
     try
     {
@@ -6748,19 +6748,19 @@ public class WebcrawlerConnector extends
     }
     catch (SocketTimeoutException e)
     {
-      throw new ACFException("Socket timeout exception accessing cached document: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket timeout exception accessing cached document: "+e.getMessage(),e);
     }
     catch (org.apache.commons.httpclient.ConnectTimeoutException e)
     {
-      throw new ACFException("Socket timeout exception accessing cached document: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket timeout exception accessing cached document: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
-      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+      throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new ACFException("IO exception accessing cached document: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO exception accessing cached document: "+e.getMessage(),e);
     }
   }
 
@@ -6845,7 +6845,7 @@ public class WebcrawlerConnector extends
   * list.
   */
   protected static void compileList(ArrayList output, ArrayList input)
-    throws ACFException
+    throws ManifoldCFException
   {
     int i = 0;
     while (i < input.size())
@@ -6857,7 +6857,7 @@ public class WebcrawlerConnector extends
       }
       catch (PatternSyntaxException e)
       {
-        throw new ACFException("Mapping regular expression '"+inputString+"' is illegal: "+e.getMessage(),e);
+        throw new ManifoldCFException("Mapping regular expression '"+inputString+"' is illegal: "+e.getMessage(),e);
       }
     }
   }
@@ -6876,7 +6876,7 @@ public class WebcrawlerConnector extends
 
   /** Get the trust store for a given document identifier (URL) */
   protected IKeystoreManager getTrustStore(String documentIdentifier)
-    throws ACFException
+    throws ManifoldCFException
   {
     return trustsDescription.getTrustStore(documentIdentifier);
   }
@@ -6911,7 +6911,7 @@ public class WebcrawlerConnector extends
 
   /** Read a document specification to yield a map of name/value pairs for metadata */
   protected static ArrayList findMetadata(DocumentSpecification spec)
-    throws ACFException
+    throws ManifoldCFException
   {
     ArrayList rval = new ArrayList();
     int i = 0;
@@ -7195,7 +7195,7 @@ public class WebcrawlerConnector extends
     * will thus cause the include or exclude regexp to be skipped.
     */
     public DocumentURLFilter(DocumentSpecification spec)
-      throws ACFException
+      throws ManifoldCFException
     {
       String includes = "";
       String excludes = "";
@@ -7303,7 +7303,7 @@ public class WebcrawlerConnector extends
           }
           catch (java.util.regex.PatternSyntaxException e)
           {
-            throw new ACFException("Canonicalization regular expression '"+urlRegexp+"' is illegal: "+e.getMessage(),e);
+            throw new ManifoldCFException("Canonicalization regular expression '"+urlRegexp+"' is illegal: "+e.getMessage(),e);
           }
         }
       }
@@ -7437,7 +7437,7 @@ public class WebcrawlerConnector extends
     *@param rawURL is the raw discovered url.  This may be relative, malformed, or otherwise unsuitable for use until final form is acheived.
     */
     public void noteDiscoveredLink(String rawURL)
-      throws ACFException;
+      throws ManifoldCFException;
   }
 
   /** This interface describes the functionality needed by an redirection processor in order to handle a redirection.
@@ -7454,7 +7454,7 @@ public class WebcrawlerConnector extends
     *@param rawTtlValue is the raw discovered ttl value.
     */
     public void noteDiscoveredTtlValue(String rawTtlValue)
-      throws ACFException;
+      throws ManifoldCFException;
 
   }
 
@@ -7464,31 +7464,31 @@ public class WebcrawlerConnector extends
   {
     /** Note the start of a form */
     public void noteFormStart(Map formAttributes)
-      throws ACFException;
+      throws ManifoldCFException;
 
     /** Note an input tag */
     public void noteFormInput(Map inputAttributes)
-      throws ACFException;
+      throws ManifoldCFException;
 
     /** Note the end of a form */
     public void noteFormEnd()
-      throws ACFException;
+      throws ManifoldCFException;
 
     /** Note discovered href */
     public void noteAHREF(String rawURL)
-      throws ACFException;
+      throws ManifoldCFException;
 
     /** Note discovered href */
     public void noteLINKHREF(String rawURL)
-      throws ACFException;
+      throws ManifoldCFException;
 
     /** Note discovered IMG SRC */
     public void noteIMGSRC(String rawURL)
-      throws ACFException;
+      throws ManifoldCFException;
 
     /** Note discovered FRAME SRC */
     public void noteFRAMESRC(String rawURL)
-      throws ACFException;
+      throws ManifoldCFException;
   }
 
   // HTML parsing classes and constants
@@ -7588,7 +7588,7 @@ public class WebcrawlerConnector extends
 
     /** Deal with a character.  No exceptions are allowed, since those would represent syntax errors, and we don't want those to cause difficulty. */
     public void dealWithCharacter(char thisChar)
-      throws ACFException
+      throws ManifoldCFException
     {
       // At this level we want basic lexical analysis - that is, we deal with identifying tags and comments, that's it.
       char thisCharLower = Character.toLowerCase(thisChar);
@@ -7876,24 +7876,24 @@ public class WebcrawlerConnector extends
           currentValueBuffer.append(thisChar);
         break;
       default:
-        throw new ACFException("Invalid state: "+Integer.toString(currentState));
+        throw new ManifoldCFException("Invalid state: "+Integer.toString(currentState));
       }
     }
 
     protected void noteTag(String tagName, Map attributes)
-      throws ACFException
+      throws ManifoldCFException
     {
       Logging.connectors.debug(" Saw tag '"+tagName+"'");
     }
 
     protected void noteEndTag(String tagName)
-      throws ACFException
+      throws ManifoldCFException
     {
       Logging.connectors.debug(" Saw end tag '"+tagName+"'");
     }
 
     public void finishUp()
-      throws ACFException
+      throws ManifoldCFException
     {
       // Does nothing
     }
@@ -7918,7 +7918,7 @@ public class WebcrawlerConnector extends
     // Override methods having to do with notification of tag discovery
 
     protected void noteTag(String tagName, Map attributes)
-      throws ACFException
+      throws ManifoldCFException
     {
       super.noteTag(tagName,attributes);
       switch (scriptParseState)
@@ -7933,12 +7933,12 @@ public class WebcrawlerConnector extends
         // Skip all tags until we see the end script one.
         break;
       default:
-        throw new ACFException("Unknown script parse state: "+Integer.toString(scriptParseState));
+        throw new ManifoldCFException("Unknown script parse state: "+Integer.toString(scriptParseState));
       }
     }
 
     protected void noteEndTag(String tagName)
-      throws ACFException
+      throws ManifoldCFException
     {
       super.noteEndTag(tagName);
       switch (scriptParseState)
@@ -7957,12 +7957,12 @@ public class WebcrawlerConnector extends
     }
 
     protected void noteNonscriptTag(String tagName, Map attributes)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
     protected void noteNonscriptEndTag(String tagName)
-      throws ACFException
+      throws ManifoldCFException
     {
     }
 
@@ -7981,7 +7981,7 @@ public class WebcrawlerConnector extends
     }
 
     protected void noteNonscriptTag(String tagName, Map attributes)
-      throws ACFException
+      throws ManifoldCFException
     {
       super.noteNonscriptTag(tagName,attributes);
       String lowerTagName = tagName.toLowerCase();
@@ -8035,7 +8035,7 @@ public class WebcrawlerConnector extends
     // Override methods having to do with notification of tag discovery
 
     protected void noteNonscriptTag(String tagName, Map attributes)
-      throws ACFException
+      throws ManifoldCFException
     {
       super.noteNonscriptTag(tagName,attributes);
       switch (formParseState)
@@ -8102,12 +8102,12 @@ public class WebcrawlerConnector extends
       case FORMPARSESTATE_IN_TEXTAREA:
         break;
       default:
-        throw new ACFException("Unknown form parse state: "+Integer.toString(formParseState));
+        throw new ManifoldCFException("Unknown form parse state: "+Integer.toString(formParseState));
       }
     }
 
     protected void noteNonscriptEndTag(String tagName)
-      throws ACFException
+      throws ManifoldCFException
     {
       super.noteNonscriptEndTag(tagName);
       switch (formParseState)
@@ -8130,7 +8130,7 @@ public class WebcrawlerConnector extends
         formParseState = FORMPARSESTATE_IN_FORM;
         break;
       default:
-        throw new ACFException("Unknown form parse state: "+Integer.toString(formParseState));
+        throw new ManifoldCFException("Unknown form parse state: "+Integer.toString(formParseState));
       }
     }
 

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentRun.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentRun.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentRun.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentRun.java Mon Oct  4 14:32:19 2010
@@ -34,7 +34,7 @@ public class AgentRun extends BaseAgents
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     ILockManager lockManager = LockManagerFactory.make(tc);
     // Clear the agents shutdown signal.
@@ -47,11 +47,11 @@ public class AgentRun extends BaseAgents
         break;
 
       // Start whatever agents need to be started
-      ACF.startAgents(tc);
+      ManifoldCF.startAgents(tc);
 
       try
       {
-        ACF.sleep(5000);
+        ManifoldCF.sleep(5000);
       }
       catch (InterruptedException e)
       {
@@ -77,7 +77,7 @@ public class AgentRun extends BaseAgents
       agentRun.execute();
       System.err.println("Shutting down...");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       Logging.root.error("Exception: "+e.getMessage(),e);
       e.printStackTrace(System.err);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentStop.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentStop.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentStop.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/AgentStop.java Mon Oct  4 14:32:19 2010
@@ -32,7 +32,7 @@ public class AgentStop extends BaseAgent
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     ILockManager lockManager = LockManagerFactory.make(tc);
     lockManager.setGlobalFlag(AgentRun.agentShutdownSignal);
@@ -54,7 +54,7 @@ public class AgentStop extends BaseAgent
       agentStop.execute();
       System.err.println("Shutdown signal sent");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace(System.err);
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/BaseAgentsInitializationCommand.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/BaseAgentsInitializationCommand.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/BaseAgentsInitializationCommand.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/BaseAgentsInitializationCommand.java Mon Oct  4 14:32:19 2010
@@ -1,9 +1,9 @@
 package org.apache.manifoldcf.agents;
 
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
 import org.apache.manifoldcf.core.InitializationCommand;
 import org.apache.manifoldcf.core.interfaces.IThreadContext;
-import org.apache.manifoldcf.core.interfaces.ACFException;
+import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.manifoldcf.core.interfaces.ThreadContextFactory;
 
 /**
@@ -11,12 +11,12 @@ import org.apache.manifoldcf.core.interf
  */
 public abstract class BaseAgentsInitializationCommand implements InitializationCommand
 {
-  public void execute() throws ACFException
+  public void execute() throws ManifoldCFException
   {
-    ACF.initializeEnvironment();
+    ManifoldCF.initializeEnvironment();
     IThreadContext tc = ThreadContextFactory.make();
     doExecute(tc);
   }
 
-  protected abstract void doExecute(IThreadContext tc) throws ACFException;
+  protected abstract void doExecute(IThreadContext tc) throws ManifoldCFException;
 }

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DefineOutputConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DefineOutputConnection.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DefineOutputConnection.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DefineOutputConnection.java Mon Oct  4 14:32:19 2010
@@ -21,7 +21,7 @@ package org.apache.manifoldcf.agents;
 import java.io.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
 import java.util.*;
 
 /** This class is used to define an output connection.
@@ -51,7 +51,7 @@ public class DefineOutputConnection
 
                 try
                 {
-                        ACF.initializeEnvironment();
+                        ManifoldCF.initializeEnvironment();
                         IThreadContext tc = ThreadContextFactory.make();
                         IOutputConnectionManager mgr = OutputConnectionManagerFactory.make(tc);
                         IOutputConnection conn = mgr.create();
@@ -67,7 +67,7 @@ public class DefineOutputConnection
                                 // Parse
                                 int pos = arg.indexOf("=");
                                 if (pos == -1)
-                                        throw new ACFException("Argument missing =");
+                                        throw new ManifoldCFException("Argument missing =");
                                 String name = arg.substring(0,pos);
                                 String value = arg.substring(pos+1);
                                 if (name.endsWith("assword"))

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DeleteOutputConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DeleteOutputConnection.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DeleteOutputConnection.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/DeleteOutputConnection.java Mon Oct  4 14:32:19 2010
@@ -21,7 +21,7 @@ package org.apache.manifoldcf.agents;
 import java.io.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
 import java.util.*;
 
 /** This class is a command that is used to delete an output connection.
@@ -46,7 +46,7 @@ public class DeleteOutputConnection
                 String connectionName = args[0];
                 try
                 {
-                        ACF.initializeEnvironment();
+                        ManifoldCF.initializeEnvironment();
                         IThreadContext tc = ThreadContextFactory.make();
                         IOutputConnectionManager mgr = OutputConnectionManagerFactory.make(tc);
                         mgr.delete(connectionName);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Install.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Install.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Install.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Install.java Mon Oct  4 14:32:19 2010
@@ -29,9 +29,9 @@ public class Install extends BaseAgentsI
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
-    ACF.installTables(tc);
+    ManifoldCF.installTables(tc);
     Logging.root.info("Agent tables installed");
   }
 
@@ -49,7 +49,7 @@ public class Install extends BaseAgentsI
       install.execute();
       System.err.println("Agent tables installed");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Register.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Register.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Register.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Register.java Mon Oct  4 14:32:19 2010
@@ -36,7 +36,7 @@ public class Register extends BaseAgents
     this.className = className;
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IAgentManager mgr = AgentManagerFactory.make(tc);
     mgr.registerAgent(className);
@@ -58,7 +58,7 @@ public class Register extends BaseAgents
       register.execute();
       System.err.println("Successfully registered agent '"+className+"'");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/RegisterOutput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/RegisterOutput.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/RegisterOutput.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/RegisterOutput.java Mon Oct  4 14:32:19 2010
@@ -39,7 +39,7 @@ public class RegisterOutput extends Tran
     this.description = description;
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
     IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
@@ -70,7 +70,7 @@ public class RegisterOutput extends Tran
       registerOutput.execute();
       System.err.println("Successfully registered output connector '"+className+"'");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeAll.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeAll.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeAll.java Mon Oct  4 14:32:19 2010
@@ -33,7 +33,7 @@ public class SynchronizeAll extends Base
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IAgentManager mgr = AgentManagerFactory.make(tc);
     String[] classnames = mgr.getAllAgents();
@@ -45,7 +45,7 @@ public class SynchronizeAll extends Base
       {
         AgentFactory.make(tc,classname);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         // Couldn't instantiate the agent: Remove from database table
         mgr.removeAgent(classname);
@@ -68,7 +68,7 @@ public class SynchronizeAll extends Base
       synchronizeAll.execute();
       System.err.println("Successfully synchronized all agents");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeOutputs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeOutputs.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeOutputs.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/SynchronizeOutputs.java Mon Oct  4 14:32:19 2010
@@ -33,12 +33,12 @@ public class SynchronizeOutputs extends 
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IDBInterface database = DBInterfaceFactory.make(tc,
-      ACF.getMasterDatabaseName(),
-      ACF.getMasterDatabaseUsername(),
-      ACF.getMasterDatabasePassword());
+      ManifoldCF.getMasterDatabaseName(),
+      ManifoldCF.getMasterDatabaseUsername(),
+      ManifoldCF.getMasterDatabasePassword());
     IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
     IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
     IResultSet classNames = mgr.getConnectors();
@@ -51,7 +51,7 @@ public class SynchronizeOutputs extends 
       {
         OutputConnectorFactory.getConnectorNoCheck(className);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         // Deregistration should be done in a transaction
         database.beginTransaction();
@@ -64,7 +64,7 @@ public class SynchronizeOutputs extends 
           // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
           mgr.removeConnector(className);
         }
-        catch (ACFException e2)
+        catch (ManifoldCFException e2)
         {
           database.signalRollback();
           throw e2;
@@ -98,7 +98,7 @@ public class SynchronizeOutputs extends 
       synchronizeOutputs.execute();
       System.err.println("Successfully synchronized all outputs");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/TransactionalAgentsInitializationCommand.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/TransactionalAgentsInitializationCommand.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/TransactionalAgentsInitializationCommand.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/TransactionalAgentsInitializationCommand.java Mon Oct  4 14:32:19 2010
@@ -1,6 +1,6 @@
 package org.apache.manifoldcf.agents;
 
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
 import org.apache.manifoldcf.core.InitializationCommand;
 import org.apache.manifoldcf.core.interfaces.*;
 
@@ -9,21 +9,21 @@ import org.apache.manifoldcf.core.interf
  */
 public abstract class TransactionalAgentsInitializationCommand implements InitializationCommand
 {
-  public void execute() throws ACFException
+  public void execute() throws ManifoldCFException
   {
-    ACF.initializeEnvironment();
+    ManifoldCF.initializeEnvironment();
     IThreadContext tc = ThreadContextFactory.make();
     IDBInterface database = DBInterfaceFactory.make(tc,
-      org.apache.manifoldcf.agents.system.ACF.getMasterDatabaseName(),
-      org.apache.manifoldcf.agents.system.ACF.getMasterDatabaseUsername(),
-      org.apache.manifoldcf.agents.system.ACF.getMasterDatabasePassword());
+      org.apache.manifoldcf.agents.system.ManifoldCF.getMasterDatabaseName(),
+      org.apache.manifoldcf.agents.system.ManifoldCF.getMasterDatabaseUsername(),
+      org.apache.manifoldcf.agents.system.ManifoldCF.getMasterDatabasePassword());
 
     try
     {
       database.beginTransaction();
       doExecute(tc);
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       database.signalRollback();
       throw e;
@@ -40,5 +40,5 @@ public abstract class TransactionalAgent
 
   }
 
-  protected abstract void doExecute(IThreadContext tc) throws ACFException;
+  protected abstract void doExecute(IThreadContext tc) throws ManifoldCFException;
 }

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegister.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegister.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegister.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegister.java Mon Oct  4 14:32:19 2010
@@ -36,7 +36,7 @@ public class UnRegister extends BaseAgen
     this.className = className;
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IAgentManager mgr = AgentManagerFactory.make(tc);
     mgr.unregisterAgent(className);
@@ -59,7 +59,7 @@ public class UnRegister extends BaseAgen
       unRegister.execute();
       System.err.println("Successfully unregistered agent '"+className+"'");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAll.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAll.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAll.java Mon Oct  4 14:32:19 2010
@@ -33,7 +33,7 @@ public class UnRegisterAll extends BaseA
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IAgentManager mgr = AgentManagerFactory.make(tc);
     String[] classnames = mgr.getAllAgents();
@@ -60,7 +60,7 @@ public class UnRegisterAll extends BaseA
       unRegisterAll.execute();
       System.err.println("Successfully unregistered all agents");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAllOutputs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAllOutputs.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAllOutputs.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterAllOutputs.java Mon Oct  4 14:32:19 2010
@@ -33,12 +33,12 @@ public class UnRegisterAllOutputs extend
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IDBInterface database = DBInterfaceFactory.make(tc,
-      ACF.getMasterDatabaseName(),
-      ACF.getMasterDatabaseUsername(),
-      ACF.getMasterDatabasePassword());
+      ManifoldCF.getMasterDatabaseName(),
+      ManifoldCF.getMasterDatabaseUsername(),
+      ManifoldCF.getMasterDatabasePassword());
     IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
     IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
     IResultSet classNames = mgr.getConnectors();
@@ -58,7 +58,7 @@ public class UnRegisterAllOutputs extend
         // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
         mgr.unregisterConnector(className);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         database.signalRollback();
         throw e;
@@ -91,7 +91,7 @@ public class UnRegisterAllOutputs extend
       unRegisterAllOutputs.execute();
       System.err.println("Successfully unregistered all output connectors");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterOutput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterOutput.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterOutput.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/UnRegisterOutput.java Mon Oct  4 14:32:19 2010
@@ -36,7 +36,7 @@ public class UnRegisterOutput extends Tr
     this.className = className;
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
     IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
     IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
@@ -65,7 +65,7 @@ public class UnRegisterOutput extends Tr
       unRegisterOutput.execute();
       System.err.println("Successfully unregistered output connector '"+className+"'");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Uninstall.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Uninstall.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Uninstall.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/Uninstall.java Mon Oct  4 14:32:19 2010
@@ -32,9 +32,9 @@ public class Uninstall extends BaseAgent
   {
   }
 
-  protected void doExecute(IThreadContext tc) throws ACFException
+  protected void doExecute(IThreadContext tc) throws ManifoldCFException
   {
-    ACF.deinstallTables(tc);
+    ManifoldCF.deinstallTables(tc);
     Logging.root.info("Agent tables uninstalled");
   }
 
@@ -52,7 +52,7 @@ public class Uninstall extends BaseAgent
       uninstall.execute();
       System.err.println("Agent tables uninstalled");
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       e.printStackTrace();
       System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/agentmanager/AgentManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/agentmanager/AgentManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/agentmanager/AgentManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/agentmanager/AgentManager.java Mon Oct  4 14:32:19 2010
@@ -39,7 +39,7 @@ public class AgentManager extends org.ap
   *@param database is the database instance.
   */
   public AgentManager(IThreadContext threadContext, IDBInterface database)
-    throws ACFException
+    throws ManifoldCFException
   {
     super(database,"agents");
     this.threadContext = threadContext;
@@ -48,7 +48,7 @@ public class AgentManager extends org.ap
   /** Install or upgrade.
   */
   public void install()
-    throws ACFException
+    throws ManifoldCFException
   {
     // We always use an outer loop, in case the upgrade will need it.
     while (true)
@@ -75,7 +75,7 @@ public class AgentManager extends org.ap
   /** Uninstall.  Also uninstalls all remaining agents.
   */
   public void deinstall()
-    throws ACFException
+    throws ManifoldCFException
   {
     // Since we are uninstalling agents, better do this inside a transaction
     beginTransaction();
@@ -93,7 +93,7 @@ public class AgentManager extends org.ap
       }
       performDrop(null);
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       signalRollback();
       throw e;
@@ -114,7 +114,7 @@ public class AgentManager extends org.ap
   *@param className is the class.
   */
   public void registerAgent(String className)
-    throws ACFException
+    throws ManifoldCFException
   {
     // Do in a transaction, so the installation is atomic
     beginTransaction();
@@ -135,7 +135,7 @@ public class AgentManager extends org.ap
       IAgent agent = AgentFactory.make(threadContext,className);
       agent.install();
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       signalRollback();
       throw e;
@@ -156,7 +156,7 @@ public class AgentManager extends org.ap
   *@param className is the class to unregister.
   */
   public void unregisterAgent(String className)
-    throws ACFException
+    throws ManifoldCFException
   {
     // Do in a transaction, so the installation is atomic
     beginTransaction();
@@ -169,7 +169,7 @@ public class AgentManager extends org.ap
       // Remove from table
       removeAgent(className);
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       signalRollback();
       throw e;
@@ -191,7 +191,7 @@ public class AgentManager extends org.ap
   *@param className is the class to remove.
   */
   public void removeAgent(String className)
-    throws ACFException
+    throws ManifoldCFException
   {
     // Remove from table
     ArrayList list = new ArrayList();
@@ -203,7 +203,7 @@ public class AgentManager extends org.ap
   *@return the classnames in an array.
   */
   public String[] getAllAgents()
-    throws ACFException
+    throws ManifoldCFException
   {
     IResultSet set = performQuery("SELECT * FROM "+getTableName(),null,null,null);
     String[] rval = new String[set.getRowCount()];

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLContext.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLContext.java Mon Oct  4 14:32:19 2010
@@ -125,7 +125,7 @@ public class XMLContext
     {
       throw new SAXException(e);
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       throw new SAXException(e);
     }
@@ -152,7 +152,7 @@ public class XMLContext
     {
       throw new SAXException(e);
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       throw new SAXException(e);
     }
@@ -171,7 +171,7 @@ public class XMLContext
     {
       throw new SAXException(e);
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       throw new SAXException(e);
     }
@@ -181,7 +181,7 @@ public class XMLContext
   * This method is called without fail at the end of any parse, whether it errored out or not, so that proper cleanup always happens for any tags left on the stack.
   */
   public final void cleanup()
-    throws ACFException
+    throws ManifoldCFException
   {
     tagCleanup();
     theStream.setContext(previousContext);
@@ -190,7 +190,7 @@ public class XMLContext
   /** This method is meant to be extended by classes that extend this class.  The form of this method is meant to enable creation of a
   * context object derived from XMLContext that understands how to actually handle tags and content within the current context. */
   protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     // The default action is to establish a new default context.
     return null;
@@ -198,19 +198,19 @@ public class XMLContext
 
   /** This method is meant to be extended by classes that extend this class */
   protected void endTag()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
   }
 
   /** This method is meant to be extended by classes that extend this class */
   protected void tagContents(char[] ch, int start, int length)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
   }
 
   /** Override this method to be called during cleanup */
   protected void tagCleanup()
-    throws ACFException
+    throws ManifoldCFException
   {
   }
 }

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLFileContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLFileContext.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLFileContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLFileContext.java Mon Oct  4 14:32:19 2010
@@ -41,7 +41,7 @@ public class XMLFileContext extends XMLO
 
   /** Full constructor.  Used for individual tags. */
   public XMLFileContext(XMLStream theStream, String namespaceURI, String localname, String qname, Attributes theseAttributes, File f)
-    throws ACFException, UnsupportedEncodingException, FileNotFoundException
+    throws ManifoldCFException, UnsupportedEncodingException, FileNotFoundException
   {
     // Construct an appropriate writer
     super(theStream,namespaceURI,localname,qname,theseAttributes,new FileOutputStream(f));
@@ -51,7 +51,7 @@ public class XMLFileContext extends XMLO
 
   /** Get file object, flushing it, closing it, and clearing it.  (This prevents the file from being deleted during cleanup of this context.) */
   public File getCompletedFile()
-    throws ACFException
+    throws ManifoldCFException
   {
     flush();
     close();
@@ -62,7 +62,7 @@ public class XMLFileContext extends XMLO
 
   /** Cleanup whatever is left over */
   public void tagCleanup()
-    throws ACFException
+    throws ManifoldCFException
   {
     if (outputFile != null)
     {

Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLOutputStreamContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLOutputStreamContext.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLOutputStreamContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLOutputStreamContext.java Mon Oct  4 14:32:19 2010
@@ -42,7 +42,7 @@ public class XMLOutputStreamContext exte
 
   /** Full constructor.  Used for individual tags. */
   public XMLOutputStreamContext(XMLStream theStream, String namespaceURI, String localname, String qname, Attributes theseAttributes, OutputStream os)
-    throws ACFException, UnsupportedEncodingException
+    throws ManifoldCFException, UnsupportedEncodingException
   {
     // Construct an appropriate writer
     super(theStream,namespaceURI,localname,qname,theseAttributes,new OutputStreamWriter(os,"utf-8"));
@@ -52,7 +52,7 @@ public class XMLOutputStreamContext exte
 
   /** Flush the data to the underlying output stream */
   public void flush()
-    throws ACFException
+    throws ManifoldCFException
   {
     try
     {
@@ -65,21 +65,21 @@ public class XMLOutputStreamContext exte
     }
     catch (java.net.SocketTimeoutException e)
     {
-      throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
-      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+      throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new ACFException("IO exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
     }
   }
 
   /** Close the underlying stream. */
   public void close()
-    throws ACFException
+    throws ManifoldCFException
   {
     // Now, close.
     try
@@ -92,15 +92,15 @@ public class XMLOutputStreamContext exte
     }
     catch (java.net.SocketTimeoutException e)
     {
-      throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
-      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+      throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new ACFException("IO exception: "+e.getMessage(),e);
+      throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
     }
   }
 



Mime
View raw message