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 [5/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/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexAuthority.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexAuthority.java (original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexAuthority.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.authorities.interfaces.*;
 import org.apache.manifoldcf.authorities.system.Logging;
-import org.apache.manifoldcf.authorities.system.ACF;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
 import com.memex.mie.*;
 import com.memex.mie.pool.*;
 import java.util.*;
@@ -69,9 +69,9 @@ public class MemexAuthority extends org.
   protected String characterEncoding = null;
 
   //mieConnection is the connection to the main Configuration Server.
-  //There will be further ACFMemexConnection objects for each
+  //There will be further ManifoldCFMemexConnection objects for each
   //physical server accessed through the physicalServers collection.
-  private ACFMemexConnection mieConnection = null;
+  private ManifoldCFMemexConnection mieConnection = null;
   private MemexConnectionPool miePool = new MemexConnectionPool();
 
   //Collection describing the logical servers making up this system
@@ -79,7 +79,7 @@ public class MemexAuthority extends org.
   private Hashtable<String, LogicalServer> logicalServersByPrefix = null;
 
   //Collection describing the physical servers making up this system
-  private Hashtable<String, ACFMemexConnection> physicalServers = null;
+  private Hashtable<String, ManifoldCFMemexConnection> physicalServers = null;
 
   //Two collections describing the entities in the set-up - one keyed by the entities' name, the other
   //by their label - generally speaking, we should use labels for anything being presented to the users
@@ -140,7 +140,7 @@ public class MemexAuthority extends org.
   /** Check connection for sanity.
   */
   public String check()
-    throws ACFException
+    throws ManifoldCFException
   {
     try{
       this.setupConnection();
@@ -155,7 +155,7 @@ public class MemexAuthority extends org.
   * in active use.
   */
   public void poll()
-    throws ACFException
+    throws ManifoldCFException
   {
     // Is the connection still valid?
     if (this.physicalServers != null && !this.physicalServers.isEmpty())
@@ -173,7 +173,7 @@ public class MemexAuthority extends org.
   /** Close the connection.  Call this before discarding the repository connector.
   */
   public void disconnect()
-    throws ACFException
+    throws ManifoldCFException
   {
     matchMap = null;
     this.cleanUpConnections();
@@ -191,7 +191,7 @@ public class MemexAuthority extends org.
   * (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
   */
   public AuthorizationResponse getAuthorizationResponse(String userName)
-    throws ACFException
+    throws ManifoldCFException
   {
 
     Hashtable<String,Hashtable<String, String>> userDBList = new Hashtable<String,Hashtable<String, String>>();
@@ -210,9 +210,9 @@ public class MemexAuthority extends org.
       this.setupConnection();
     }
     catch(ServiceInterruption mex){
-      //something transient's gone wrong connecting.  Throw a ACFException (which will be caught, and the appropriate default behavior instigated).
+      //something transient's gone wrong connecting.  Throw a ManifoldCFException (which will be caught, and the appropriate default behavior instigated).
       Logging.authorityConnectors.warn("Memex: Transient authority error: "+mex.getMessage(),mex.getCause());
-      throw new ACFException(mex.getMessage(),mex.getCause());
+      throw new ManifoldCFException(mex.getMessage(),mex.getCause());
     }
 
     //Next - search for the user's record in the mxUserGroup database
@@ -250,7 +250,7 @@ public class MemexAuthority extends org.
             //This shouldn't happen - should only be one entry per user
             if (Logging.authorityConnectors.isDebugEnabled())
               Logging.authorityConnectors.warn("Memex: Multiple entries found for '"+userName+"'!");
-            throw new ACFException("Memex Error retrieving user information : multiple entries found for user " + userName);
+            throw new ManifoldCFException("Memex Error retrieving user information : multiple entries found for user " + userName);
           }else{
             //OK - we found the user - we need four fields from thier record - groups, servers, attributes and keys
             if (Logging.authorityConnectors.isDebugEnabled())
@@ -364,18 +364,18 @@ public class MemexAuthority extends org.
         }else{
           //This is bad - we're connected, but we can't find the UserGroup database
           Logging.authorityConnectors.error("Memex: Can't locate UserGroup database.");
-          throw new ACFException("Memex Error: Can't locate the mxUserGroup Database");
+          throw new ManifoldCFException("Memex Error: Can't locate the mxUserGroup Database");
         }
       }else{
         //This is bad as well - we're connected but didn't find any registry entries
         Logging.authorityConnectors.error("Memex: Configuration Server's registry appears to be null.");
-        throw new ACFException("Memex Error: Configuration Server's registry is null");
+        throw new ManifoldCFException("Memex Error: Configuration Server's registry is null");
       }
     }catch(MemexException me){
       //something threw an error - most likely a connection issue.
-      // ACFExceptions will be handled by getting the default authorization response instead.
+      // ManifoldCFExceptions will be handled by getting the default authorization response instead.
       Logging.authorityConnectors.warn("Memex: Unknown error calculating user access tokens: "+me.getMessage(),me);
-      throw new ACFException("Memex transient error: "+me.getMessage(),me);
+      throw new ManifoldCFException("Memex transient error: "+me.getMessage(),me);
     }
   }
 
@@ -403,7 +403,7 @@ public class MemexAuthority extends org.
   *@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("Memex Server");
     tabsArray.add("User Mapping");
@@ -623,7 +623,7 @@ public class MemexAuthority extends org.
   *@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 memexServerName = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.memex.MemexAuthority.CONFIG_PARAM_MEMEXSERVERNAME);
     if (memexServerName == null)
@@ -736,7 +736,7 @@ public class MemexAuthority extends org.
   *@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 memexServerName = variableContext.getParameter("memexservername");
     if (memexServerName != null)
@@ -777,7 +777,7 @@ public class MemexAuthority extends org.
   *@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
   {
     out.print(
 "<table class=\"displaytable\">\n"+
@@ -824,7 +824,7 @@ public class MemexAuthority extends org.
   //
   ///////////////////////////////////////////////////////////////////////
   public void setupConnection()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     boolean connected = false;
     if((this.physicalServers != null) && !(this.physicalServers.isEmpty())){
@@ -832,7 +832,7 @@ public class MemexAuthority extends org.
       connected = true;
       for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
         String serverkey = (String)serverkeys.nextElement();
-        ACFMemexConnection pserver = physicalServers.get(serverkey);
+        ManifoldCFMemexConnection pserver = physicalServers.get(serverkey);
         if(!(pserver.isConnected())){
           connected = false;
         }
@@ -852,10 +852,10 @@ public class MemexAuthority extends org.
         miePool.setCharset(characterEncoding);
 
         //Initialise data structures
-        mieConnection = new ACFMemexConnection();
+        mieConnection = new ManifoldCFMemexConnection();
         logicalServers = new Hashtable<String, LogicalServer>();
         logicalServersByPrefix = new Hashtable<String, LogicalServer>();
-        physicalServers = new Hashtable<String, ACFMemexConnection>();
+        physicalServers = new Hashtable<String, ManifoldCFMemexConnection>();
         entitiesByName = new Hashtable<String, MemexEntity>();
         entitiesByLabel = new Hashtable<String, MemexEntity>();
         entitiesByPrefix = new Hashtable<String, MemexEntity>();
@@ -888,7 +888,7 @@ public class MemexAuthority extends org.
         roleGroups = this.initialiseRoleGroups();
       }
       catch(PoolAuthenticationException e){
-        throw new ACFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
+        throw new ManifoldCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
       }
       catch(PoolException e){
         Logging.authorityConnectors.warn("Memex: Pool error connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " - " + e.getMessage() + " - retrying",e);
@@ -929,7 +929,7 @@ public class MemexAuthority extends org.
       while (i < serverKeyArray.length)
       {
         String serverkey = serverKeyArray[i++];
-        ACFMemexConnection currentMIE = physicalServers.get(serverkey);
+        ManifoldCFMemexConnection currentMIE = physicalServers.get(serverkey);
         try{
           // Remove history directories belonging to this session
           physicalServers.remove(serverkey);
@@ -957,7 +957,7 @@ public class MemexAuthority extends org.
 
       for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
         String serverkey = (String)serverkeys.nextElement();
-        ACFMemexConnection currentMIE = physicalServers.get(serverkey);
+        ManifoldCFMemexConnection currentMIE = physicalServers.get(serverkey);
         try{
           // Remove history directories belonging to this session
           String histdir = currentMIE.mie.mxie_history_current();
@@ -1097,7 +1097,7 @@ public class MemexAuthority extends org.
             serverFields.add(serversource);
             //mieConnection.mie.mxie_goto_record(hist, x);
             mieConnection.mie.mxie_decode_fields(serverFields);
-            ACFMemexConnection mie;
+            ManifoldCFMemexConnection mie;
             if(serversource.getText().equals("configuration-server")){
               mie = mieConnection;
             }else{
@@ -1314,14 +1314,14 @@ public class MemexAuthority extends org.
 
 
 
-  private ACFMemexConnection getPhysicalServer(String server, int port){
+  private ManifoldCFMemexConnection getPhysicalServer(String server, int port){
 
     String key = server + ":" + Integer.toString(port);
 
     if(physicalServers.containsKey(key)){
-      return (ACFMemexConnection)physicalServers.get(key);
+      return (ManifoldCFMemexConnection)physicalServers.get(key);
     }else{
-      ACFMemexConnection newServer = new ACFMemexConnection();
+      ManifoldCFMemexConnection newServer = new ManifoldCFMemexConnection();
       try{
         MemexConnection newMIE = miePool.getConnection(server, port);
         newServer.mie = newMIE;

Modified: incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MemexConnector.java Mon Oct  4 14:32:19 2010
@@ -23,7 +23,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 java.util.*;
 import java.io.*;
 import org.w3c.dom.*;
@@ -99,9 +99,9 @@ public class MemexConnector extends org.
   protected String webServerPort = null;
 
   //mieConnection is the connection to the main Configuration Server.
-  //There will be further ACFMemexConnection objects for each
+  //There will be further ManifoldCFMemexConnection objects for each
   //physical server accessed through the physicalServers collection.
-  private ACFMemexConnection mieConnection = null;
+  private ManifoldCFMemexConnection mieConnection = null;
   private MemexConnectionPool miePool = new MemexConnectionPool();
 
   //Collection describing the logical servers making up this system
@@ -109,7 +109,7 @@ public class MemexConnector extends org.
   private Hashtable<String, LogicalServer> logicalServersByPrefix = null;
 
   //Collection describing the physical servers making up this system
-  private Hashtable<String, ACFMemexConnection> physicalServers = null;
+  private Hashtable<String, ManifoldCFMemexConnection> physicalServers = null;
 
   //Two collections describing the entities in the set-up - one keyed by the entities' name, the other
   //by their label - generally speaking, we should use labels for anything being presented to the users
@@ -199,7 +199,7 @@ public class MemexConnector extends org.
       }
       return new String[]{""};
     }
-    catch(ACFException e){
+    catch(ManifoldCFException e){
       Logging.connectors.warn("Memex connection error: "+e.getMessage(),e);
       return new String[]{""};
     }
@@ -249,7 +249,7 @@ public class MemexConnector extends org.
   *@return the connection's status as a displayable string.
   */
   public String check()
-    throws ACFException
+    throws ManifoldCFException
   {
     try{
       this.setupConnection();
@@ -264,7 +264,7 @@ public class MemexConnector extends org.
   * in active use.
   */
   public void poll()
-    throws ACFException
+    throws ManifoldCFException
   {
     // Is the connection still valid?
     if (this.physicalServers != null && !this.physicalServers.isEmpty())
@@ -283,7 +283,7 @@ public class MemexConnector extends org.
   /** Disconnect from Memex.
   */
   public void disconnect()
-    throws ACFException
+    throws ManifoldCFException
   {
     this.cleanUpConnections();
     userName = null;
@@ -305,7 +305,7 @@ public class MemexConnector extends org.
   *@return true if the resource is found, false if not.  In either case, output may be filled in.
   */
   public boolean requestInfo(Configuration output, String command)
-    throws ACFException
+    throws ManifoldCFException
   {
     if (command.startsWith("databases/"))
     {
@@ -331,11 +331,11 @@ public class MemexConnector extends org.
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else if (command.equals("virtualservers"))
@@ -354,11 +354,11 @@ public class MemexConnector extends org.
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else if (command.equals("entitytypes"))
@@ -383,11 +383,11 @@ public class MemexConnector extends org.
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else if (command.startsWith("fields/"))
@@ -407,11 +407,11 @@ public class MemexConnector extends org.
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else if (command.equals("matchablefields/"))
@@ -431,11 +431,11 @@ public class MemexConnector extends org.
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else
@@ -484,7 +484,7 @@ public class MemexConnector extends org.
   */
   public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
     long startTime, long endTime)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     //start by making sure we have a connection
     this.setupConnection();
@@ -670,11 +670,11 @@ public class MemexConnector extends org.
         {
           try
           {
-            ACF.sleep(100L);
+            ManifoldCF.sleep(100L);
           }
           catch (InterruptedException e)
           {
-            throw new ACFException(e.getMessage(),e,ACFException.INTERRUPTED);
+            throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED);
           }
         }
       }
@@ -691,7 +691,7 @@ public class MemexConnector extends org.
   }
 
   protected static boolean checkCriteria(Map<String,DecodedField> fields, List<CrawlMatchDescription> specificMatchCriteria)
-    throws ACFException
+    throws ManifoldCFException
   {
     // An empty array means EVERYTHING.
     if (specificMatchCriteria.size() == 0)
@@ -739,7 +739,7 @@ public class MemexConnector extends org.
             return true;
         }
         else
-          throw new ACFException("Bad operator value: "+operator);
+          throw new ManifoldCFException("Bad operator value: "+operator);
       }
     }
     return false;
@@ -747,7 +747,7 @@ public class MemexConnector extends org.
 
   protected void doDecode(ArrayList fieldListX, List<Map<String,DecodedField>> fieldsPerRecord, List<CrawlMatchDescription> specificMatchCriteria,
     LogicalServer ls, ISeedingActivity activities)
-    throws MemexException, ACFException
+    throws MemexException, ManifoldCFException
   {
     // First, do the decode
     ls.getMIE().mie.mxie_decode_fields(fieldListX);
@@ -844,7 +844,7 @@ public class MemexConnector extends org.
   */
   public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activity,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     String[] newVersions = new String[documentIdentifiers.length];
     // Build a hash of the indices for each document identifier
@@ -1272,7 +1272,7 @@ public class MemexConnector extends org.
   */
   public void processDocuments(String[] documentIdentifiers, String[] documentVersions,
     IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
 
     // First, create the CrawlDescription object
@@ -1304,7 +1304,7 @@ public class MemexConnector extends org.
           Hashtable currentRec = lookupCachedRecord(recordURN);
           if (currentRec == null)
             // This should never happen!!
-            throw new ACFException("Process request for a record whose version was never requested!!");
+            throw new ManifoldCFException("Process request for a record whose version was never requested!!");
 
           // Now, unpack the version string to obtain what fields we should ingest etc.
           ArrayList<String> primaryList = new ArrayList<String>();
@@ -1462,7 +1462,7 @@ public class MemexConnector extends org.
         }
       }
     }catch(java.io.UnsupportedEncodingException e){
-      throw new ACFException("Unsupported encoding: "+e.getMessage(),e);
+      throw new ManifoldCFException("Unsupported encoding: "+e.getMessage(),e);
     }
 
   }
@@ -1515,7 +1515,7 @@ public class MemexConnector extends org.
   *@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
   {
     // Clean up our part of the cache.
     for (int i = 0; i < documentIdentifiers.length; i++)
@@ -1548,7 +1548,7 @@ public class MemexConnector extends org.
   *@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("Memex Server");
     tabsArray.add("Web Server");
@@ -1774,7 +1774,7 @@ public class MemexConnector extends org.
   *@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 memexServerName = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.memex.MemexConnector.CONFIG_PARAM_MEMEXSERVERNAME);
     if (memexServerName == null)
@@ -1919,7 +1919,7 @@ public class MemexConnector extends org.
   *@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 memexServerName = variableContext.getParameter("memexservername");
     if (memexServerName != null)
@@ -1967,7 +1967,7 @@ public class MemexConnector extends org.
   *@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
   {
     out.print(
 "<table class=\"displaytable\">\n"+
@@ -2015,7 +2015,7 @@ public class MemexConnector extends org.
   *@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("Record Criteria");
     tabsArray.add("Entities");
@@ -2301,7 +2301,7 @@ public class MemexConnector extends org.
   *@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;
@@ -2467,7 +2467,7 @@ public class MemexConnector extends org.
           ii++;
         }
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         out.print(
 "  <tr>\n"+
@@ -2728,7 +2728,7 @@ public class MemexConnector extends org.
 "              </select>\n"
           );
         }
-        catch (ACFException e)
+        catch (ManifoldCFException e)
         {
           out.print(
 "              "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"\n"
@@ -2783,7 +2783,7 @@ public class MemexConnector extends org.
 "              </select>\n"
             );
           }
-          catch (ACFException e)
+          catch (ManifoldCFException e)
           {
             out.print(
 "              "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"\n"
@@ -2852,7 +2852,7 @@ public class MemexConnector extends org.
 "              <input type=\"text\" name=\"rulefieldvalueselect\" size=\"32\" value=\"\"/>\n"
             );
           }
-          catch (ACFException e)
+          catch (ManifoldCFException e)
           {
             out.print(
 "              "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"\n"
@@ -3043,7 +3043,7 @@ public class MemexConnector extends org.
   *@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
   {
     String x = variableContext.getParameter("entitytypecount");
     if (x != null && x.length() > 0)
@@ -3294,7 +3294,7 @@ public class MemexConnector extends org.
   *@param ds is the current document specification for this job.
   */
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     out.print(
 "<table class=\"displaytable\">\n"+
@@ -3534,7 +3534,7 @@ public class MemexConnector extends org.
 
   /** Return a list of databases (instances of an entity type) on a given virtual server*/
   public NameDescription[] listDatabasesForVirtualServer(String virtualServerName)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     //Start by making sure we're connected
     this.setupConnection();
@@ -3543,11 +3543,11 @@ public class MemexConnector extends org.
     if(!(logicalServers.containsKey(virtualServerName))){
       //If we can't find the virtual server, its unlikely we can
       //recover
-      throw new ACFException("Memex error: Virtual server "+virtualServerName+" not found");
+      throw new ManifoldCFException("Memex error: Virtual server "+virtualServerName+" not found");
     }
     LogicalServer ls = logicalServers.get(virtualServerName);
     if (ls == null)
-      throw new ACFException("Memex error: Virtual server "+virtualServerName+" not found");
+      throw new ManifoldCFException("Memex error: Virtual server "+virtualServerName+" not found");
 
     ArrayList<String> dblist = new ArrayList<String>();
     for(int i = 0; i < ls.getDatabaseCount(); i++){
@@ -3576,7 +3576,7 @@ public class MemexConnector extends org.
 
   /** Return a list of virtual servers for the connection, in sorted alphabetic order */
   public String[] listVirtualServers()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     //Start by making sure we're connected
     this.setupConnection();
@@ -3609,7 +3609,7 @@ public class MemexConnector extends org.
 
   /** Return a list of the entity types there are for the connection, in sorted alphabetic order */
   public NameDescription[] listEntityTypes()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     //Start by making sure we're connected
     this.setupConnection();
@@ -3646,7 +3646,7 @@ public class MemexConnector extends org.
 
   /** Return a list of the field names for the entity prefix in the implied connection, in sorted alphabetic order */
   public String[] listFieldNames(String entityPrefix)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     //Start by making sure we're connected
     this.setupConnection();
@@ -3656,12 +3656,12 @@ public class MemexConnector extends org.
       if (entity != null)
         return entity.getFields();
     }
-    throw new ACFException("Entity type '"+entityPrefix+"' does not exist");
+    throw new ManifoldCFException("Entity type '"+entityPrefix+"' does not exist");
   }
 
   /** Return a list of the field names that mie can directly fetch from a record (for document specification) */
   public String[] listMatchableFieldNames(String entityPrefix)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     String[] candidates = listFieldNames(entityPrefix);
     if (candidates == null)
@@ -3807,7 +3807,7 @@ public class MemexConnector extends org.
   //
   ///////////////////////////////////////////////////////////////////////
   private void setupConnection()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
 
     boolean connected = false;
@@ -3816,7 +3816,7 @@ public class MemexConnector extends org.
       connected = true;
       for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
         String serverkey = (String)serverkeys.nextElement();
-        ACFMemexConnection pserver = physicalServers.get(serverkey);
+        ManifoldCFMemexConnection pserver = physicalServers.get(serverkey);
         if(!(pserver.isConnected())){
           connected = false;
         }
@@ -3836,10 +3836,10 @@ public class MemexConnector extends org.
         miePool.setCharset(characterEncoding);
 
         //Initialise data structures
-        mieConnection = new ACFMemexConnection();
+        mieConnection = new ManifoldCFMemexConnection();
         logicalServers = new Hashtable<String, LogicalServer>();
         logicalServersByPrefix = new Hashtable<String, LogicalServer>();
-        physicalServers = new Hashtable<String, ACFMemexConnection>();
+        physicalServers = new Hashtable<String, ManifoldCFMemexConnection>();
         entitiesByName = new Hashtable<String, MemexEntity>();
         entitiesByLabel = new Hashtable<String, MemexEntity>();
         entitiesByPrefix = new Hashtable<String, MemexEntity>();
@@ -3867,7 +3867,7 @@ public class MemexConnector extends org.
 
       }
       catch(PoolAuthenticationException e){
-        throw new ACFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
+        throw new ManifoldCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
       }
       catch(PoolException e){
         Logging.connectors.warn("Memex: Pool error connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " - " + e.getMessage() + " - retrying",e);
@@ -3907,7 +3907,7 @@ public class MemexConnector extends org.
       while (i < serverKeyArray.length)
       {
         String serverkey = serverKeyArray[i++];
-        ACFMemexConnection currentMIE = physicalServers.get(serverkey);
+        ManifoldCFMemexConnection currentMIE = physicalServers.get(serverkey);
         try{
           // Remove history directories belonging to this session
           physicalServers.remove(serverkey);
@@ -3937,7 +3937,7 @@ public class MemexConnector extends org.
   /**Creates an alphabetically ordered list of entity objects.
   */
   private void getEntities()
-    throws MemexException, ACFException, ServiceInterruption
+    throws MemexException, ManifoldCFException, ServiceInterruption
   {
     String mxEntityPath = null;
     String[] entityReturn = new String[1];
@@ -4007,11 +4007,11 @@ public class MemexConnector extends org.
                   // Parse it!
                   entityForm = db.parse(formStream);
                 }catch(ParserConfigurationException e){
-                  throw new ACFException("Can't find a valid parser: "+e.getMessage(),e);
+                  throw new ManifoldCFException("Can't find a valid parser: "+e.getMessage(),e);
                 }catch(SAXException e){
-                  throw new ACFException("XML had parse errors: "+e.getMessage(),e);
+                  throw new ManifoldCFException("XML had parse errors: "+e.getMessage(),e);
                 }catch(InterruptedIOException e){
-                  throw new ACFException(e.getMessage(),e,ACFException.INTERRUPTED);
+                  throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED);
                 }catch(IOException e){
                   // I/O problem; treat as  a service interruption
                   long currentTime = System.currentTimeMillis();
@@ -4026,11 +4026,11 @@ public class MemexConnector extends org.
                   }
                   catch (InterruptedIOException e)
                   {
-                    throw new ACFException(e.getMessage(),e,ACFException.INTERRUPTED);
+                    throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED);
                   }
                   catch (IOException e)
                   {
-                    throw new ACFException("Error reading memex form data: "+e.getMessage(),e);
+                    throw new ManifoldCFException("Error reading memex form data: "+e.getMessage(),e);
                   }
                 }
               }catch(MemexException e){
@@ -4110,7 +4110,7 @@ public class MemexConnector extends org.
             serverFields.add(serversource);
             //mieConnection.mie.mxie_goto_record(hist, x);
             mieConnection.mie.mxie_decode_fields(serverFields);
-            ACFMemexConnection mie;
+            ManifoldCFMemexConnection mie;
             if(serversource.getText().equals("configuration-server")){
               mie = mieConnection;
             }else{
@@ -4131,14 +4131,14 @@ public class MemexConnector extends org.
     }
   }
 
-  private ACFMemexConnection getPhysicalServer(String server, int port){
+  private ManifoldCFMemexConnection getPhysicalServer(String server, int port){
 
     String key = server + ":" + Integer.toString(port);
 
     if(physicalServers.containsKey(key)){
-      return (ACFMemexConnection)physicalServers.get(key);
+      return (ManifoldCFMemexConnection)physicalServers.get(key);
     }else{
-      ACFMemexConnection newServer = new ACFMemexConnection();
+      ManifoldCFMemexConnection newServer = new ManifoldCFMemexConnection();
       try{
         MemexConnection newMIE = miePool.getConnection(server, port);
         newServer.mie = newMIE;
@@ -4261,7 +4261,7 @@ public class MemexConnector extends org.
   * @return - the hash table representation of the record. Null if its not found
   */
   private Hashtable getmxRecordObj(LogicalServer ls, int histno, int recnum)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     Hashtable mxRecord = null;
     try{
@@ -4430,7 +4430,7 @@ public class MemexConnector extends org.
       }
       catch (InterruptedIOException eek)
       {
-        throw new ACFException(eek.getMessage(),eek,ACFException.INTERRUPTED);
+        throw new ManifoldCFException(eek.getMessage(),eek,ManifoldCFException.INTERRUPTED);
       }
       catch (IOException eek) {
         // Treat this as a service interruption
@@ -4454,15 +4454,15 @@ public class MemexConnector extends org.
     }
     catch (UnsupportedEncodingException e){
       Logging.connectors.error("Memex: "+e.getMessage(),e);
-      throw new ACFException(e.getMessage(),e);
+      throw new ManifoldCFException(e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
-      throw new ACFException(e.getMessage(),e,ACFException.INTERRUPTED);
+      throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new ACFException(e.getMessage(),e);
+      throw new ManifoldCFException(e.getMessage(),e);
     }
   }
 

Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java Mon Oct  4 14:32:19 2010
@@ -25,7 +25,7 @@ import org.apache.manifoldcf.crawler.con
 import org.apache.manifoldcf.crawler.connectors.meridio.RMDataSet.RMDataSet;
 import org.tempuri.GroupResult;
 import org.apache.manifoldcf.authorities.system.Logging;
-import org.apache.manifoldcf.authorities.system.ACF;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
 import org.apache.manifoldcf.authorities.interfaces.AuthorizationResponse;
 
 import org.apache.commons.httpclient.protocol.Protocol;
@@ -122,7 +122,7 @@ public class MeridioAuthority extends or
 
   /** Set up connection before attempting to use it */
   protected void attemptToConnect()
-    throws ACFException
+    throws ManifoldCFException
   {
     if (meridio_ == null)
     {
@@ -135,7 +135,7 @@ public class MeridioAuthority extends or
 
       String DMWSProtocol = params.getParameter("DMWSServerProtocol");
       if (DMWSProtocol == null)
-        throw new ACFException("Missing required configuration parameter: DMWSServerProtocol");
+        throw new ManifoldCFException("Missing required configuration parameter: DMWSServerProtocol");
       String DMWSPort = params.getParameter("DMWSServerPort");
       if (DMWSPort == null || DMWSPort.length() == 0)
         DMWSPort = "";
@@ -149,7 +149,7 @@ public class MeridioAuthority extends or
 
       String RMWSProtocol = params.getParameter("RMWSServerProtocol");
       if (RMWSProtocol == null)
-        throw new ACFException("Missing required configuration parameter: RMWSServerProtocol");
+        throw new ManifoldCFException("Missing required configuration parameter: RMWSServerProtocol");
       String RMWSPort = params.getParameter("RMWSServerPort");
       if (RMWSPort == null || RMWSPort.length() == 0)
         RMWSPort = "";
@@ -163,14 +163,14 @@ public class MeridioAuthority extends or
 
       String MetaCartaWSProtocol = params.getParameter("MetaCartaWSServerProtocol");
       if (MetaCartaWSProtocol == null)
-        throw new ACFException("Missing required configuration parameter: MetaCartaWSServerProtocol");
+        throw new ManifoldCFException("Missing required configuration parameter: MetaCartaWSServerProtocol");
       String MetaCartaWSPort = params.getParameter("MetaCartaWSServerPort");
       if (MetaCartaWSPort == null || MetaCartaWSPort.length() == 0)
         MetaCartaWSPort = "";
       else
         MetaCartaWSPort = ":" + MetaCartaWSPort;
 
-      String ACFWSUrlString = MetaCartaWSProtocol + "://" +
+      String ManifoldCFWSUrlString = MetaCartaWSProtocol + "://" +
         params.getParameter("MetaCartaWSServerName") +
         MetaCartaWSPort +
         params.getParameter("MetaCartaWSLocation");
@@ -192,7 +192,7 @@ public class MeridioAuthority extends or
       {
         DmwsURL = new URL(DMWSUrlString);
         RmwsURL = new URL(RMWSUrlString);
-        MetaCartawsURL = new URL(ACFWSUrlString);
+        MetaCartawsURL = new URL(ManifoldCFWSUrlString);
 
         if (Logging.authorityConnectors.isDebugEnabled())
         {
@@ -204,7 +204,7 @@ public class MeridioAuthority extends or
       }
       catch (MalformedURLException malformedURLException)
       {
-        throw new ACFException("Meridio: Could not construct the URL for either " +
+        throw new ManifoldCFException("Meridio: Could not construct the URL for either " +
           "the Meridio DM, Meridio RM, or MetaCarta Meridio Web Service: "+malformedURLException, malformedURLException);
       }
 
@@ -214,9 +214,9 @@ public class MeridioAuthority extends or
         * Now try and login to Meridio; the wrapper's constructor can be
         * used as it calls the Meridio login method
         *================================================================*/
-        File meridioWSDDLocation = ACF.getFileProperty(wsddPathProperty);
+        File meridioWSDDLocation = ManifoldCF.getFileProperty(wsddPathProperty);
         if (meridioWSDDLocation == null)
-          throw new ACFException("Meridio wsdd location path (property "+wsddPathProperty+") must be specified!");
+          throw new ManifoldCFException("Meridio wsdd location path (property "+wsddPathProperty+") must be specified!");
 
         meridio_ = new MeridioWrapper(Logging.authorityConnectors, DmwsURL, RmwsURL, MetaCartawsURL,
           DMWSProxyHost, DMWSProxyPort, RMWSProxyHost, RMWSProxyPort, MetaCartaWSProxyHost, MetaCartaWSProxyPort,
@@ -227,7 +227,7 @@ public class MeridioAuthority extends or
       }
       catch (UnknownHostException unknownHostException)
       {
-        throw new ACFException("Meridio: A Unknown Host Exception occurred while " +
+        throw new ManifoldCFException("Meridio: A Unknown Host Exception occurred while " +
           "connecting - is a network software and hardware configuration: "+unknownHostException.getMessage(), unknownHostException);
       }
       catch (org.apache.axis.AxisFault e)
@@ -240,23 +240,23 @@ public class MeridioAuthority extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
           }
-          throw new ACFException("Unknown http error occurred while connecting: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while connecting: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (Logging.authorityConnectors.isDebugEnabled())
           Logging.authorityConnectors.debug("Meridio: Got an unknown remote exception connecting - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
-        throw new ACFException("Remote procedure exception: "+e.getMessage(),e);
+        throw new ManifoldCFException("Remote procedure exception: "+e.getMessage(),e);
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: An unknown remote exception occurred while " +
+        throw new ManifoldCFException("Meridio: An unknown remote exception occurred while " +
           "connecting: "+remoteException.getMessage(), remoteException);
       }
 
@@ -270,7 +270,7 @@ public class MeridioAuthority extends or
   /** Check connection for sanity.
   */
   public String check()
-    throws ACFException
+    throws ManifoldCFException
   {
     Logging.authorityConnectors.debug("Meridio: Entering 'check' method");
     attemptToConnect();
@@ -331,7 +331,7 @@ public class MeridioAuthority extends or
       {
         String exceptionName = e.getFaultString();
         if (exceptionName.equals("java.lang.InterruptedException"))
-          throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+          throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
       }
       if (Logging.authorityConnectors.isDebugEnabled())
         Logging.authorityConnectors.debug("Meridio: Got an unknown remote exception checking - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
@@ -365,7 +365,7 @@ public class MeridioAuthority extends or
   /** Close the connection.  Call this before discarding the repository connector.
   */
   public void disconnect()
-    throws ACFException
+    throws ManifoldCFException
   {
     Logging.authorityConnectors.debug("Meridio: Entering 'disconnect' method");
     try
@@ -395,7 +395,7 @@ public class MeridioAuthority extends or
       {
         String exceptionName = e.getFaultString();
         if (exceptionName.equals("java.lang.InterruptedException"))
-          throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+          throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
       }
       if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
       {
@@ -442,7 +442,7 @@ public class MeridioAuthority extends or
   * (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
   */
   public AuthorizationResponse getAuthorizationResponse(String userName)
-    throws ACFException
+    throws ManifoldCFException
   {
     if (Logging.authorityConnectors.isDebugEnabled())
       Logging.authorityConnectors.debug("Meridio: Authentication user name = '" + userName + "'");
@@ -561,15 +561,15 @@ public class MeridioAuthority extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
           }
-          throw new ACFException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
         {
@@ -583,18 +583,18 @@ public class MeridioAuthority extends or
 
         if (Logging.authorityConnectors.isDebugEnabled())
           Logging.authorityConnectors.debug("Meridio: Got an unknown remote exception getting user tokens - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
-        throw new ACFException("Axis fault: "+e.getMessage(),  e);
+        throw new ManifoldCFException("Axis fault: "+e.getMessage(),  e);
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: A remote exception occurred while getting user tokens: " +
+        throw new ManifoldCFException("Meridio: A remote exception occurred while getting user tokens: " +
           remoteException.getMessage(), remoteException);
       }
       catch (MeridioDataSetException meridioDataSetException)
       {
         Logging.authorityConnectors.error("Meridio: A provlem occurred manipulating the Web Service XML: " +
           meridioDataSetException.getMessage(), meridioDataSetException);
-        throw new ACFException("Meridio: A problem occurred manipulating the Web " +
+        throw new ManifoldCFException("Meridio: A problem occurred manipulating the Web " +
           "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
       }
     }
@@ -623,7 +623,7 @@ public class MeridioAuthority extends or
   *@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("Document Server");
     tabsArray.add("Records Server");
@@ -773,7 +773,7 @@ public class MeridioAuthority extends or
   *@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 dmwsServerProtocol = parameters.getParameter("DMWSServerProtocol");
     if (dmwsServerProtocol == null)
@@ -1065,7 +1065,7 @@ public class MeridioAuthority extends or
   *@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 dmwsServerProtocol = variableContext.getParameter("dmwsServerProtocol");
     if (dmwsServerProtocol != null)
@@ -1194,7 +1194,7 @@ public class MeridioAuthority extends or
           }
           catch (IOException e)
           {
-            throw new ACFException(e.getMessage(),e);
+            throw new ManifoldCFException(e.getMessage(),e);
           }
         }
 
@@ -1217,7 +1217,7 @@ public class MeridioAuthority extends or
   *@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
   {
     out.print(
 "<table class=\"displaytable\">\n"+

Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java Mon Oct  4 14:32:19 2010
@@ -29,7 +29,7 @@ import org.apache.manifoldcf.crawler.con
 import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.MeridioWrapper;
 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.apache.commons.httpclient.protocol.Protocol;
 import org.apache.commons.httpclient.protocol.ProtocolFactory;
@@ -117,7 +117,7 @@ public class MeridioConnector extends or
 
   /** Set up the session with Meridio */
   protected void getSession()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     if (meridio_ == null)
     {
@@ -183,8 +183,8 @@ public class MeridioConnector extends or
       }
       catch (MalformedURLException malformedURLException)
       {
-        throw new ACFException("Meridio: Could not construct the URL for either " +
-          "the DM or RM Meridio Web Service", malformedURLException, ACFException.REPOSITORY_CONNECTION_ERROR);
+        throw new ManifoldCFException("Meridio: Could not construct the URL for either " +
+          "the DM or RM Meridio Web Service", malformedURLException, ManifoldCFException.REPOSITORY_CONNECTION_ERROR);
       }
 
       // Do the second part (where we actually try to connect to the system)
@@ -194,9 +194,9 @@ public class MeridioConnector extends or
         * Now try and login to Meridio; the wrapper's constructor can be
         * used as it calls the Meridio login method
         *================================================================*/
-        File meridioWSDDLocation = ACF.getFileProperty(wsddPathProperty);
+        File meridioWSDDLocation = ManifoldCF.getFileProperty(wsddPathProperty);
         if (meridioWSDDLocation == null)
-          throw new ACFException("Meridio wsdd location path (property "+wsddPathProperty+") must be specified!");
+          throw new ManifoldCFException("Meridio wsdd location path (property "+wsddPathProperty+") must be specified!");
 
         meridio_ = new MeridioWrapper(Logging.connectors, DmwsURL, RmwsURL, null,
           params.getParameter("DMWSProxyHost"),
@@ -213,7 +213,7 @@ public class MeridioConnector extends or
       }
       catch (UnknownHostException unknownHostException)
       {
-        throw new ACFException("Meridio: A Unknown Host Exception occurred while " +
+        throw new ManifoldCFException("Meridio: A Unknown Host Exception occurred while " +
           "connecting - is a network software and hardware configuration: "+unknownHostException.getMessage(), unknownHostException);
       }
       catch (org.apache.axis.AxisFault e)
@@ -226,15 +226,15 @@ public class MeridioConnector extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
           }
-          throw new ACFException("Unknown http error occurred while connecting: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while connecting: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (Logging.connectors.isDebugEnabled())
           Logging.connectors.debug("Meridio: Got an unknown remote exception connecting - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
@@ -243,7 +243,7 @@ public class MeridioConnector extends or
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: An unknown remote exception occurred while " +
+        throw new ManifoldCFException("Meridio: An unknown remote exception occurred while " +
           "connecting: "+remoteException.getMessage(), remoteException);
       }
 
@@ -270,7 +270,7 @@ public class MeridioConnector extends or
   *@return the connection's status as a displayable string.
   */
   public String check()
-    throws ACFException
+    throws ManifoldCFException
   {
     Logging.connectors.debug("Meridio: Entering 'check' method");
 
@@ -284,7 +284,7 @@ public class MeridioConnector extends or
     {
       return "Meridio temporarily unavailable: "+e.getMessage();
     }
-    catch (ACFException e)
+    catch (ManifoldCFException e)
     {
       return e.getMessage();
     }
@@ -340,7 +340,7 @@ public class MeridioConnector extends or
       {
         String exceptionName = e.getFaultString();
         if (exceptionName.equals("java.lang.InterruptedException"))
-          throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+          throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
       }
       if (Logging.connectors.isDebugEnabled())
         Logging.connectors.debug("Meridio: Got an unknown remote exception checking - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
@@ -391,7 +391,7 @@ public class MeridioConnector extends or
   /** Close the connection.  Call this before discarding the repository connector.
   */
   public void disconnect()
-    throws ACFException
+    throws ManifoldCFException
   {
     Logging.connectors.debug("Meridio: Entering 'disconnect' method");
 
@@ -422,7 +422,7 @@ public class MeridioConnector extends or
       {
         String exceptionName = e.getFaultString();
         if (exceptionName.equals("java.lang.InterruptedException"))
-          throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+          throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
       }
       if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
       {
@@ -473,7 +473,7 @@ public class MeridioConnector extends or
   *@return true if the resource is found, false if not.  In either case, output may be filled in.
   */
   public boolean requestInfo(Configuration output, String command)
-    throws ACFException
+    throws ManifoldCFException
   {
     if (command.equals("categories"))
     {
@@ -491,11 +491,11 @@ public class MeridioConnector extends or
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else if (command.equals("documentproperties"))
@@ -514,11 +514,11 @@ public class MeridioConnector extends or
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else if (command.startsWith("classorfolder/"))
@@ -531,7 +531,7 @@ public class MeridioConnector extends or
       }
       catch (NumberFormatException e)
       {
-        ACF.createErrorNode(output,new ACFException(e.getMessage(),e));
+        ManifoldCF.createErrorNode(output,new ManifoldCFException(e.getMessage(),e));
 	return false;
       }
       try
@@ -564,11 +564,11 @@ public class MeridioConnector extends or
       }
       catch (ServiceInterruption e)
       {
-        ACF.createServiceInterruptionNode(output,e);
+        ManifoldCF.createServiceInterruptionNode(output,e);
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
-        ACF.createErrorNode(output,e);
+        ManifoldCF.createErrorNode(output,e);
       }
     }
     else
@@ -589,7 +589,7 @@ public class MeridioConnector extends or
   *@return the stream of local document identifiers that should be added to the queue.
   */
   public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec, long startTime, long endTime)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     Logging.connectors.debug("Meridio: Entering 'getDocumentIdentifiers' method");
 
@@ -631,7 +631,7 @@ public class MeridioConnector extends or
   */
   public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     Logging.connectors.debug("Meridio: Entering 'getDocumentVersions' method");
 
@@ -848,15 +848,15 @@ public class MeridioConnector extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
           }
-          throw new ACFException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
         {
@@ -875,12 +875,12 @@ public class MeridioConnector extends or
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: A remote exception occurred while getting doc versions: " +
+        throw new ManifoldCFException("Meridio: A remote exception occurred while getting doc versions: " +
           remoteException.getMessage(), remoteException);
       }
       catch (MeridioDataSetException meridioDataSetException)
       {
-        throw new ACFException("Meridio: A problem occurred manipulating the Web " +
+        throw new ManifoldCFException("Meridio: A problem occurred manipulating the Web " +
           "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
       }
     }
@@ -900,7 +900,7 @@ public class MeridioConnector extends or
   * 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
   {
     Logging.connectors.debug("Meridio: Entering 'processDocuments' method");
 
@@ -1395,15 +1395,15 @@ public class MeridioConnector extends or
           }
           catch (java.net.SocketTimeoutException ioex)
           {
-            throw new ACFException("Socket timeout exception: "+ioex.getMessage(), ioex);
+            throw new ManifoldCFException("Socket timeout exception: "+ioex.getMessage(), ioex);
           }
           catch (org.apache.commons.httpclient.ConnectTimeoutException ioex)
           {
-            throw new ACFException("Connect timeout exception: "+ioex.getMessage(), ioex);
+            throw new ManifoldCFException("Connect timeout exception: "+ioex.getMessage(), ioex);
           }
           catch (InterruptedIOException e)
           {
-            throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
           }
           catch (org.apache.axis.AxisFault e)
           {
@@ -1415,12 +1415,12 @@ public class MeridioConnector extends or
           }
           catch (SOAPException soapEx)
           {
-            throw new ACFException("SOAP Exception encountered while retrieving document content: "+soapEx.getMessage(),
+            throw new ManifoldCFException("SOAP Exception encountered while retrieving document content: "+soapEx.getMessage(),
               soapEx);
           }
           catch (IOException ioex)
           {
-            throw new ACFException("Input stream failure: "+ioex.getMessage(), ioex);
+            throw new ManifoldCFException("Input stream failure: "+ioex.getMessage(), ioex);
           }
           i++;
         }
@@ -1438,15 +1438,15 @@ public class MeridioConnector extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
           }
-          throw new ACFException("Unknown http error occurred while processing docs: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while processing docs: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
         {
@@ -1465,12 +1465,12 @@ public class MeridioConnector extends or
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: A remote exception occurred while " +
+        throw new ManifoldCFException("Meridio: A remote exception occurred while " +
           "processing a Meridio document: "+remoteException.getMessage(), remoteException);
       }
       catch (MeridioDataSetException meridioDataSetException)
       {
-        throw new ACFException("Meridio: A DataSet exception occurred while  " +
+        throw new ManifoldCFException("Meridio: A DataSet exception occurred while  " +
           "processing a Meridio document", meridioDataSetException);
       }
     }
@@ -1493,7 +1493,7 @@ public class MeridioConnector extends or
   *@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("Document Server");
     tabsArray.add("Records Server");
@@ -1636,7 +1636,7 @@ public class MeridioConnector extends or
   *@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 dmwsServerProtocol = parameters.getParameter("DMWSServerProtocol");
     if (dmwsServerProtocol == null)
@@ -1943,7 +1943,7 @@ public class MeridioConnector extends or
   *@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 dmwsServerProtocol = variableContext.getParameter("dmwsServerProtocol");
     if (dmwsServerProtocol != null)
@@ -2090,7 +2090,7 @@ public class MeridioConnector extends or
   *@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
   {
     out.print(
 "<table class=\"displaytable\">\n"+
@@ -2190,7 +2190,7 @@ public class MeridioConnector extends or
   *@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("Search Paths");
     tabsArray.add("Content Types");
@@ -2285,7 +2285,7 @@ public class MeridioConnector extends or
   *@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;
@@ -2419,7 +2419,7 @@ public class MeridioConnector extends or
 "    <td class=\"message\" colspan=\"2\">Service interruption: "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"</td>\n"
         );
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         e.printStackTrace();
         out.print(
@@ -2573,7 +2573,7 @@ public class MeridioConnector extends or
 "    <td class=\"message\" colspan=\"2\">Service interruption: "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"</td>\n"
         );
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         e.printStackTrace();
         out.print(
@@ -2855,7 +2855,7 @@ public class MeridioConnector extends or
 "    <td class=\"message\" colspan=\"4\">Service interruption: "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"</td>\n"
         );
       }
-      catch (ACFException e)
+      catch (ManifoldCFException e)
       {
         e.printStackTrace();
         out.print(
@@ -2955,7 +2955,7 @@ public class MeridioConnector extends or
   *@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
   {
     int i;
 
@@ -3306,7 +3306,7 @@ public class MeridioConnector extends or
   *@param ds is the current document specification for this job.
   */
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
-    throws ACFException, IOException
+    throws ManifoldCFException, IOException
   {
     out.print(
 "<table class=\"displaytable\">\n"+
@@ -4462,7 +4462,7 @@ public class MeridioConnector extends or
       long startTime,
       long endTime
     )
-      throws ACFException,ServiceInterruption
+      throws ManifoldCFException,ServiceInterruption
     {
       Logging.connectors.debug("Meridio: Entering 'IdentifierStream' constructor");
       while (true)
@@ -4492,15 +4492,15 @@ public class MeridioConnector extends or
             {
               elem.normalize();
               String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-              throw new ACFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+              throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
             }
-            throw new ACFException("Unknown http error occurred while performing search: "+e.getMessage(),e);
+            throw new ManifoldCFException("Unknown http error occurred while performing search: "+e.getMessage(),e);
           }
           if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
           {
             String exceptionName = e.getFaultString();
             if (exceptionName.equals("java.lang.InterruptedException"))
-              throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+              throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
           }
           if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
           {
@@ -4518,12 +4518,12 @@ public class MeridioConnector extends or
         }
         catch (RemoteException remoteException)
         {
-          throw new ACFException("Meridio: A Remote Exception occurred while " +
+          throw new ManifoldCFException("Meridio: A Remote Exception occurred while " +
             "performing a search: "+remoteException.getMessage(), remoteException);
         }
         catch (MeridioDataSetException meridioDataSetException)
         {
-          throw new ACFException("Meridio: A problem occurred manipulating the Web " +
+          throw new ManifoldCFException("Meridio: A problem occurred manipulating the Web " +
             "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
         }
       }
@@ -4535,7 +4535,7 @@ public class MeridioConnector extends or
     *@return the next document identifier, or null if there are no more.
     */
     public String getNextIdentifier()
-      throws ACFException, ServiceInterruption
+      throws ManifoldCFException, ServiceInterruption
     {
       Logging.connectors.debug("Meridio: Entering 'getNextIdentifier' method");
 
@@ -4571,15 +4571,15 @@ public class MeridioConnector extends or
                 {
                   elem.normalize();
                   String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-                  throw new ACFException("Unexpected http error code "+httpErrorCode+" performing search: "+e.getMessage());
+                  throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" performing search: "+e.getMessage());
                 }
-                throw new ACFException("Unknown http error occurred while performing search: "+e.getMessage(),e);
+                throw new ManifoldCFException("Unknown http error occurred while performing search: "+e.getMessage(),e);
               }
               if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
               {
                 String exceptionName = e.getFaultString();
                 if (exceptionName.equals("java.lang.InterruptedException"))
-                  throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+                  throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
               }
               if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
               {
@@ -4591,7 +4591,7 @@ public class MeridioConnector extends or
                 }
               }
 
-              throw new ACFException("Meridio: Got an unknown remote exception performing search - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+              throw new ManifoldCFException("Meridio: Got an unknown remote exception performing search - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
             }
             catch (RemoteException remoteException)
             {
@@ -4602,7 +4602,7 @@ public class MeridioConnector extends or
             }
             catch (MeridioDataSetException meridioDataSetException)
             {
-              throw new ACFException("Meridio: A problem occurred manipulating the Web " +
+              throw new ManifoldCFException("Meridio: A problem occurred manipulating the Web " +
                 "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
             }
           }
@@ -4629,7 +4629,7 @@ public class MeridioConnector extends or
     /** Close the stream.
     */
     public void close()
-      throws ACFException
+      throws ManifoldCFException
     {
       Logging.connectors.debug("Meridio: Entering 'IdentifierStream.close' method");
 
@@ -4655,7 +4655,7 @@ public class MeridioConnector extends or
   *@return Sorted array of strings containing the category names
   */
   public String [] getMeridioCategories ()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     Logging.connectors.debug("Entering 'getMeridioCategories' method");
 
@@ -4705,15 +4705,15 @@ public class MeridioConnector extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" getting categories: "+e.getMessage());
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" getting categories: "+e.getMessage());
           }
-          throw new ACFException("Unknown http error occurred while getting categories: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while getting categories: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
         {
@@ -4725,16 +4725,16 @@ public class MeridioConnector extends or
           }
         }
 
-        throw new ACFException("Meridio: Got an unknown remote exception getting categories - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+        throw new ManifoldCFException("Meridio: Got an unknown remote exception getting categories - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: A Remote Exception occurred while " +
+        throw new ManifoldCFException("Meridio: A Remote Exception occurred while " +
           "retrieving the Meridio categories: "+remoteException.getMessage(), remoteException);
       }
       catch (MeridioDataSetException meridioDataSetException)
       {
-        throw new ACFException("Meridio: DataSet Exception occurred retrieving the Meridio categories: "+meridioDataSetException.getMessage(),
+        throw new ManifoldCFException("Meridio: DataSet Exception occurred retrieving the Meridio categories: "+meridioDataSetException.getMessage(),
           meridioDataSetException);
       }
     }
@@ -4743,7 +4743,7 @@ public class MeridioConnector extends or
 
 
   public String [] getMeridioDocumentProperties ()
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     Logging.connectors.debug("Entering 'getMeridioDocumentProperties' method");
 
@@ -4814,15 +4814,15 @@ public class MeridioConnector extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" getting document properties: "+e.getMessage());
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" getting document properties: "+e.getMessage());
           }
-          throw new ACFException("Unknown http error occurred while getting document properties: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while getting document properties: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
         {
@@ -4834,16 +4834,16 @@ public class MeridioConnector extends or
           }
         }
 
-        throw new ACFException("Meridio: Got an unknown remote exception getting document properties - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+        throw new ManifoldCFException("Meridio: Got an unknown remote exception getting document properties - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: A Remote Exception occurred while " +
+        throw new ManifoldCFException("Meridio: A Remote Exception occurred while " +
           "retrieving the Meridio document properties: "+remoteException.getMessage(), remoteException);
       }
       catch (MeridioDataSetException meridioDataSetException)
       {
-        throw new ACFException("Meridio: DataSet Exception occurred retrieving the Meridio document properties: "+meridioDataSetException.getMessage(),
+        throw new ManifoldCFException("Meridio: DataSet Exception occurred retrieving the Meridio document properties: "+meridioDataSetException.getMessage(),
           meridioDataSetException);
       }
     }
@@ -4855,7 +4855,7 @@ public class MeridioConnector extends or
   (
     int classOrFolderId
   )
-    throws ACFException, ServiceInterruption
+    throws ManifoldCFException, ServiceInterruption
   {
     Logging.connectors.debug("Entering 'getClassOrFolderContents' method");
 
@@ -4922,15 +4922,15 @@ public class MeridioConnector extends or
           {
             elem.normalize();
             String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-            throw new ACFException("Unexpected http error code "+httpErrorCode+" getting class or folder contents: "+e.getMessage());
+            throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" getting class or folder contents: "+e.getMessage());
           }
-          throw new ACFException("Unknown http error occurred while getting class or folder contents: "+e.getMessage(),e);
+          throw new ManifoldCFException("Unknown http error occurred while getting class or folder contents: "+e.getMessage(),e);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
         {
           String exceptionName = e.getFaultString();
           if (exceptionName.equals("java.lang.InterruptedException"))
-            throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+            throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
         }
         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
         {
@@ -4942,16 +4942,16 @@ public class MeridioConnector extends or
           }
         }
 
-        throw new ACFException("Meridio: Got an unknown remote exception getting class or folder contents - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+        throw new ManifoldCFException("Meridio: Got an unknown remote exception getting class or folder contents - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
       }
       catch (RemoteException remoteException)
       {
-        throw new ACFException("Meridio: A Remote Exception occurred while " +
+        throw new ManifoldCFException("Meridio: A Remote Exception occurred while " +
           "retrieving class or folder contents: "+remoteException.getMessage(), remoteException);
       }
       catch (MeridioDataSetException meridioDataSetException)
       {
-        throw new ACFException("Meridio: A problem occurred manipulating the Web " +
+        throw new ManifoldCFException("Meridio: A problem occurred manipulating the Web " +
           "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
       }
     }



Mime
View raw message