Return-Path: Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: (qmail 47761 invoked from network); 4 Oct 2010 14:32:59 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Oct 2010 14:32:59 -0000 Received: (qmail 84404 invoked by uid 500); 4 Oct 2010 14:32:59 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 84287 invoked by uid 500); 4 Oct 2010 14:32:58 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 84275 invoked by uid 99); 4 Oct 2010 14:32:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Oct 2010 14:32:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Oct 2010 14:32:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A6F82388A66; Mon, 4 Oct 2010 14:32:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1004255 [2/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 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101004143234.7A6F82388A66@eris.apache.org> Modified: incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1004255&r1=1004254&r2=1004255&view=diff ============================================================================== --- incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java (original) +++ incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.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.apache.manifoldcf.crawler.common.DCTM.*; @@ -101,30 +101,30 @@ public class DCTM extends org.apache.man /** Get a DFC session. This will be done every time it is needed. */ protected void getSession() - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { if (session == null) { // Perform basic parameter checking, and debug output. if (docbaseName == null || docbaseName.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_DOCBASE+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_DOCBASE+" required but not set"); if (Logging.connectors.isDebugEnabled()) Logging.connectors.debug("DCTM: Docbase = '" + docbaseName + "'"); if (userName == null || userName.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_USERNAME+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_USERNAME+" required but not set"); if (Logging.connectors.isDebugEnabled()) Logging.connectors.debug("DCTM: Username = '" + userName + "'"); if (password == null || password.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_PASSWORD+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_PASSWORD+" required but not set"); Logging.connectors.debug("DCTM: Password exists"); if (webtopBaseURL == null || webtopBaseURL.length() < 1) - throw new ACFException("Required parameter "+CONFIG_PARAM_WEBTOPBASEURL+" missing"); + throw new ManifoldCFException("Required parameter "+CONFIG_PARAM_WEBTOPBASEURL+" missing"); if (domain == null) // Empty domain is allowed @@ -156,11 +156,11 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (java.net.MalformedURLException e) { - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } catch (NotBoundException e) { @@ -173,7 +173,7 @@ public class DCTM extends org.apache.man { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); // Treat this as a transient problem Logging.connectors.warn("DCTM: Transient remote exception creating session: "+e.getMessage(),e); currentTime = System.currentTimeMillis(); @@ -189,7 +189,7 @@ public class DCTM extends org.apache.man throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12*60*60000L, -1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -249,7 +249,7 @@ public class DCTM extends org.apache.man } protected void getAttributesForType(ArrayList list, String typeName) - throws DocumentumException, ACFException, ServiceInterruption + throws DocumentumException, ManifoldCFException, ServiceInterruption { String strDQL = "select attr_name FROM dmi_dd_attr_info where type_name = '" + typeName + "'"; @@ -277,13 +277,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -327,7 +327,7 @@ public class DCTM extends org.apache.man /** Check connection, with appropriate retries */ protected void checkConnection() - throws DocumentumException, ACFException, ServiceInterruption + throws DocumentumException, ManifoldCFException, ServiceInterruption { while (true) { @@ -353,13 +353,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -410,7 +410,7 @@ public class DCTM extends org.apache.man /** Build date string with appropriate reset */ protected String buildDateString(long timevalue) - throws DocumentumException, ACFException, ServiceInterruption + throws DocumentumException, ManifoldCFException, ServiceInterruption { while (true) { @@ -436,13 +436,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -487,7 +487,7 @@ public class DCTM extends org.apache.man /** Release the session, if it's time. */ protected void releaseCheck() - throws ACFException + throws ManifoldCFException { if (lastSessionFetch == -1L) return; @@ -516,13 +516,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); session = null; lastSessionFetch = -1L; // Treat this as a transient problem @@ -579,7 +579,7 @@ public class DCTM extends org.apache.man *@return the connection's status as a displayable string. */ public String check() - throws ACFException + throws ManifoldCFException { try { @@ -594,14 +594,14 @@ public class DCTM extends org.apache.man if (e.getType() == DocumentumException.TYPE_SERVICEINTERRUPTION) throw new ServiceInterruption(e.getMessage(),0L); else - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } catch (ServiceInterruption e) { return "Connection temporarily failed: "+e.getMessage(); } - catch (ACFException e) + catch (ManifoldCFException e) { return "Connection failed: "+e.getMessage(); } @@ -629,7 +629,7 @@ public class DCTM extends org.apache.man * in active use. */ public void poll() - throws ACFException + throws ManifoldCFException { releaseCheck(); } @@ -637,7 +637,7 @@ public class DCTM extends org.apache.man /** Disconnect from Documentum. */ public void disconnect() - throws ACFException + throws ManifoldCFException { if (session != null) { @@ -662,13 +662,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); session = null; lastSessionFetch = -1L; // Treat this as a transient problem @@ -698,7 +698,7 @@ public class DCTM extends org.apache.man /** Protected method for calculating the URI */ protected String convertToURI(String strObjectId, String objectType) - throws ACFException + throws ManifoldCFException { String strWebtopBaseUrl = webtopBaseURL; @@ -852,7 +852,7 @@ public class DCTM extends org.apache.man *@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("contenttypes")) { @@ -870,11 +870,11 @@ public class DCTM extends org.apache.man } 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("objecttypes")) @@ -893,11 +893,11 @@ public class DCTM extends org.apache.man } 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("folders/")) @@ -918,11 +918,11 @@ public class DCTM extends org.apache.man } 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("indexableattributes/")) @@ -943,11 +943,11 @@ public class DCTM extends org.apache.man } 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 @@ -964,7 +964,7 @@ public class DCTM extends org.apache.man */ public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec, long startTime, long endTime) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { // First, build the query @@ -1131,7 +1131,7 @@ public class DCTM extends org.apache.man // It's ok to leave the thread still active; we'll be shutting down anyway. throw e; } - catch (ACFException e) + catch (ManifoldCFException e) { t.abort(); // We need the join, because we really don't want this documentum session to be @@ -1151,7 +1151,7 @@ public class DCTM extends org.apache.man { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -1164,7 +1164,7 @@ public class DCTM extends org.apache.man } catch (InterruptedException e) { - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } } } @@ -1178,14 +1178,14 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption getting versions: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L, currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } /** Do a query and read back the name column */ protected static String[] convertToDCTMTypes(ArrayList contentList) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { if (contentList != null && contentList.size() > 0) { @@ -1329,7 +1329,7 @@ public class DCTM extends org.apache.man */ public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activity, DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { Logging.connectors.debug("DCTM: Inside getDocumentVersions"); @@ -1380,7 +1380,7 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption listing attributes: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -1480,13 +1480,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -1509,7 +1509,7 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption getting versions: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -1710,7 +1710,7 @@ public class DCTM extends org.apache.man */ public void processDocuments(String[] documentIdentifiers, String[] documentVersions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { Logging.connectors.debug("DCTM: Inside processDocuments"); @@ -1756,8 +1756,8 @@ public class DCTM extends org.apache.man throw (RemoteException)thr; else if (thr instanceof DocumentumException) throw (DocumentumException)thr; - else if (thr instanceof ACFException) - throw (ACFException)thr; + else if (thr instanceof ManifoldCFException) + throw (ManifoldCFException)thr; else throw (Error)thr; } @@ -1793,13 +1793,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -1828,15 +1828,15 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption reading files: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } catch (java.io.InterruptedIOException e) { - throw new ACFException("Interrupted IO: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted IO: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (java.io.IOException e) { - throw new ACFException("IO exception: "+e.getMessage(),e); + throw new ManifoldCFException("IO exception: "+e.getMessage(),e); } } @@ -1848,7 +1848,7 @@ public class DCTM extends org.apache.man *@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 { // Nothing to do } @@ -1876,7 +1876,7 @@ public class DCTM extends org.apache.man *@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("Docbase"); tabsArray.add("Webtop"); @@ -1932,7 +1932,7 @@ public class DCTM extends org.apache.man *@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 docbaseName = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_DOCBASE); if (docbaseName == null) @@ -2013,7 +2013,7 @@ public class DCTM extends org.apache.man *@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 docbaseName = variableContext.getParameter("docbasename"); if (docbaseName != null) @@ -2046,7 +2046,7 @@ public class DCTM extends org.apache.man *@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( "\n"+ @@ -2094,7 +2094,7 @@ public class DCTM extends org.apache.man *@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("Paths"); tabsArray.add("Document Types"); @@ -2178,7 +2178,7 @@ public class DCTM extends org.apache.man *@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; @@ -2247,7 +2247,7 @@ public class DCTM extends org.apache.man pathSoFar = "/"; childList = getChildFolderNames(pathSoFar); if (childList == null) - throw new ACFException("Can't find any children for root folder"); + throw new ManifoldCFException("Can't find any children for root folder"); } out.print( @@ -2287,7 +2287,7 @@ public class DCTM extends org.apache.man ); } } - catch (ACFException e) + catch (ManifoldCFException e) { out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())); } @@ -2555,7 +2555,7 @@ public class DCTM extends org.apache.man } } } - catch (ACFException e) + catch (ManifoldCFException e) { out.print( " \n"+ @@ -2673,7 +2673,7 @@ public class DCTM extends org.apache.man } } } - catch (ACFException e) + catch (ManifoldCFException e) { out.print( " \n"+ @@ -2865,7 +2865,7 @@ public class DCTM extends org.apache.man *@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("pathcount"); if (x != null) @@ -3173,7 +3173,7 @@ public class DCTM extends org.apache.man *@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( "
\n"+ @@ -3510,7 +3510,7 @@ public class DCTM extends org.apache.man * This one returns the supported content types, which will be presented in the UI for selection. */ public String[] getContentTypes() - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { try { @@ -3547,13 +3547,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -3574,14 +3574,14 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption reading content types: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L, 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } /** Documentum-specific method, for UI support. */ public String[] getObjectTypes() - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { try { @@ -3621,13 +3621,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -3648,7 +3648,7 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption reading object types: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L, currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -3739,7 +3739,7 @@ public class DCTM extends org.apache.man * use in constructing the starting folder for a job's document specification. */ public String[] getChildFolderNames(String strTheParentFolderPath) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { try { @@ -3767,13 +3767,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -3794,7 +3794,7 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption reading child folders: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -3806,7 +3806,7 @@ public class DCTM extends org.apache.man *@return the array of data attributes, in alphabetic order. */ public String[] getIngestableAttributes(String docType) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { try { @@ -3843,13 +3843,13 @@ public class DCTM extends org.apache.man catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { long currentTime = System.currentTimeMillis(); @@ -3870,7 +3870,7 @@ public class DCTM extends org.apache.man Logging.connectors.warn("DCTM: Remote service interruption reading child folders: "+e.getMessage(),e); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -4040,7 +4040,7 @@ public class DCTM extends org.apache.man /** Constructor */ public SystemMetadataDescription(DocumentSpecification spec) - throws ACFException + throws ManifoldCFException { pathAttributeName = null; int i = 0; @@ -4069,7 +4069,7 @@ public class DCTM extends org.apache.man /** Given an identifier, get the array of translated strings that goes into the metadata. */ public String[] getPathAttributeValue(IDocumentumObject object) - throws DocumentumException, RemoteException, ACFException + throws DocumentumException, RemoteException, ManifoldCFException { String[] paths = object.getFolderPaths(pathMap); String[] rval = new String[paths.length]; Modified: incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java?rev=1004255&r1=1004254&r2=1004255&view=diff ============================================================================== --- incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java (original) +++ incubator/lcf/trunk/modules/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java Mon Oct 4 14:32:19 2010 @@ -261,7 +261,7 @@ public class MatchMap /** Perform a translation. */ public String translate(String input) - throws ACFException + throws ManifoldCFException { // Build pattern vector if not already there if (matchPatterns == null) @@ -278,7 +278,7 @@ public class MatchMap catch (java.util.regex.PatternSyntaxException e) { matchPatterns = null; - throw new ACFException("For match expression '"+regexp+"', found pattern syntax error: "+e.getMessage(),e); + throw new ManifoldCFException("For match expression '"+regexp+"', found pattern syntax error: "+e.getMessage(),e); } i++; } Modified: incubator/lcf/trunk/modules/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff ============================================================================== --- incubator/lcf/trunk/modules/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original) +++ incubator/lcf/trunk/modules/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.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.apache.manifoldcf.crawler.common.filenet.*; @@ -141,30 +141,30 @@ public class FilenetConnector extends or /** Get a DFC session. This will be done every time it is needed. */ protected void getSession() - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { if (session == null) { // Check for parameter validity if (userID == null || userID.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_USERID+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_USERID+" required but not set"); if (Logging.connectors.isDebugEnabled()) Logging.connectors.debug("FileNet: UserID = '" + userID + "'"); if (password == null || password.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_PASSWORD+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_PASSWORD+" required but not set"); Logging.connectors.debug("FileNet: Password exists"); if (objectStore == null || objectStore.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_OBJECTSTORE+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_OBJECTSTORE+" required but not set"); if (serverProtocol == null || serverProtocol.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_SERVERPROTOCOL+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_SERVERPROTOCOL+" required but not set"); if (serverHostname == null || serverHostname.length() < 1) - throw new ACFException("Parameter "+CONFIG_PARAM_SERVERHOSTNAME+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_SERVERHOSTNAME+" required but not set"); if (serverPort != null && serverPort.length() < 1) serverPort = null; @@ -173,10 +173,10 @@ public class FilenetConnector extends or Logging.connectors.debug("FileNet: Server URI is '"+serverWSIURI+"'"); if (docUrlServerProtocol == null || docUrlServerProtocol.length() == 0) - throw new ACFException("Parameter "+CONFIG_PARAM_URLPROTOCOL+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_URLPROTOCOL+" required but not set"); if (docUrlServerName == null || docUrlServerName.length() == 0) - throw new ACFException("Parameter "+CONFIG_PARAM_URLHOSTNAME+" required but not set"); + throw new ManifoldCFException("Parameter "+CONFIG_PARAM_URLHOSTNAME+" required but not set"); if (Logging.connectors.isDebugEnabled()) Logging.connectors.debug("FileNet: Document base URI is '"+docURIPrefix+"'"); @@ -205,11 +205,11 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (java.net.MalformedURLException e) { - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } catch (NotBoundException e) { @@ -222,7 +222,7 @@ public class FilenetConnector extends or { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); // Treat this as a transient problem Logging.connectors.warn("FileNet: Transient remote exception creating session: "+e.getMessage(),e); currentTime = System.currentTimeMillis(); @@ -237,7 +237,7 @@ public class FilenetConnector extends or currentTime = System.currentTimeMillis(); throw new ServiceInterruption(e.getMessage(),e,currentTime + 300000L,currentTime + 12 * 60 * 60000L,-1,true); } - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -279,7 +279,7 @@ public class FilenetConnector extends or /** Release the session, if it's time. */ protected void releaseCheck() - throws ACFException + throws ManifoldCFException { if (lastSessionFetch == -1L) return; @@ -308,13 +308,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); session = null; lastSessionFetch = -1L; // Treat this as a transient problem @@ -432,7 +432,7 @@ public class FilenetConnector extends or *@return the connection's status as a displayable string. */ public String check() - throws ACFException + throws ManifoldCFException { try { @@ -447,14 +447,14 @@ public class FilenetConnector extends or if (e.getType() == FilenetException.TYPE_SERVICEINTERRUPTION) throw new ServiceInterruption(e.getMessage(),0L); else - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } catch (ServiceInterruption e) { return "Connection temporarily failed: "+e.getMessage(); } - catch (ACFException e) + catch (ManifoldCFException e) { return "Connection failed: "+e.getMessage(); } @@ -464,7 +464,7 @@ public class FilenetConnector extends or * in active use. */ public void poll() - throws ACFException + throws ManifoldCFException { releaseCheck(); } @@ -472,7 +472,7 @@ public class FilenetConnector extends or /** Disconnect from Filenet. */ public void disconnect() - throws ACFException + throws ManifoldCFException { if (session != null) { @@ -497,13 +497,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); session = null; lastSessionFetch = -1L; // Treat this as a transient problem @@ -540,7 +540,7 @@ public class FilenetConnector 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.startsWith("metadatafields/")) { @@ -565,11 +565,11 @@ public class FilenetConnector 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("documentclasses")) @@ -594,11 +594,11 @@ public class FilenetConnector 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("mimetypes")) @@ -617,11 +617,11 @@ public class FilenetConnector 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 @@ -638,7 +638,7 @@ public class FilenetConnector extends or */ public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec, long startTime, long endTime) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { Logging.connectors.debug("FileNet: Inside addSeedDocuments"); @@ -744,7 +744,7 @@ public class FilenetConnector extends or if (e.getType() == FilenetException.TYPE_SERVICEINTERRUPTION) throw new ServiceInterruption(e.getMessage(),e,currentTime+300000L,currentTime+12*60*60000L,-1,true); else - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -834,7 +834,7 @@ public class FilenetConnector extends or */ public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activity, DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { Logging.connectors.debug("FileNet: Inside getDocumentVersions"); @@ -1050,7 +1050,7 @@ public class FilenetConnector extends or rval[i] = null; } else - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } else @@ -1100,7 +1100,7 @@ public class FilenetConnector extends or */ public void processDocuments(String[] documentIdentifiers, String[] documentVersions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { Logging.connectors.debug("FileNet: Inside processDocuments"); @@ -1133,7 +1133,7 @@ public class FilenetConnector extends or } catch (NumberFormatException e) { - throw new ACFException("Bad number in identifier: "+documentIdentifier,e); + throw new ManifoldCFException("Bad number in identifier: "+documentIdentifier,e); } // Unpack the information in the document version @@ -1197,7 +1197,7 @@ public class FilenetConnector extends or { activities.recordActivity(new Long(startTime),ACTIVITY_FETCH, null,documentIdentifier,"Miscellaneous error",e.getMessage(),null); - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } @@ -1260,7 +1260,7 @@ public class FilenetConnector extends or } catch (InterruptedIOException e) { - throw new ACFException(e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (IOException e) { @@ -1276,12 +1276,12 @@ public class FilenetConnector extends or } catch (InterruptedIOException e) { - throw new ACFException(e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (IOException e) { Logging.connectors.error("FileNet: IO Exception ingesting document '"+documentIdentifier+"': "+e.getMessage(),e); - throw new ACFException("IO Exception ingesting document '"+documentIdentifier+"': "+e.getMessage(),e); + throw new ManifoldCFException("IO Exception ingesting document '"+documentIdentifier+"': "+e.getMessage(),e); } } } @@ -1336,7 +1336,7 @@ public class FilenetConnector extends or } else { - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } } @@ -1353,7 +1353,7 @@ public class FilenetConnector extends or *@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 { // Nothing to do } @@ -1381,7 +1381,7 @@ public class FilenetConnector 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("Server"); tabsArray.add("Object Store"); @@ -1485,7 +1485,7 @@ public class FilenetConnector 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 userID = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_USERID); if (userID == null) @@ -1665,7 +1665,7 @@ public class FilenetConnector 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 serverprotocol = variableContext.getParameter("serverprotocol"); if (serverprotocol != null) @@ -1725,7 +1725,7 @@ public class FilenetConnector 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( "
\n"+ @@ -1773,7 +1773,7 @@ public class FilenetConnector 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("Document Classes"); tabsArray.add("Mime Types"); @@ -1837,7 +1837,7 @@ public class FilenetConnector 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; Iterator iter; @@ -1880,7 +1880,7 @@ public class FilenetConnector extends or documentClassFields.put(documentClass,metaFields); } } - catch (ACFException e) + catch (ManifoldCFException e) { message = e.getMessage(); } @@ -2139,7 +2139,7 @@ public class FilenetConnector extends or { mimeTypesArray = getMimeTypes(); } - catch (ACFException e) + catch (ManifoldCFException e) { message = e.getMessage(); } @@ -2333,7 +2333,7 @@ public class FilenetConnector 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 { String[] x; String y; @@ -2523,7 +2523,7 @@ public class FilenetConnector 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 { int i; Iterator iter; @@ -2762,7 +2762,7 @@ public class FilenetConnector extends or /** Get the set of available document classes, with details */ public DocumentClassDefinition[] getDocumentClassesDetails() - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { long currentTime; try @@ -2776,13 +2776,13 @@ public class FilenetConnector extends or if (e.getType() == FilenetException.TYPE_SERVICEINTERRUPTION) throw new ServiceInterruption(e.getMessage(),e,currentTime+300000L,currentTime+12*60*60000L,-1,true); else - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } /** Get the set of available metadata fields per document class */ public MetadataFieldDefinition[] getDocumentClassMetadataFieldsDetails(String documentClassName) - throws ServiceInterruption, ACFException + throws ServiceInterruption, ManifoldCFException { long currentTime; try @@ -2796,13 +2796,13 @@ public class FilenetConnector extends or if (e.getType() == FilenetException.TYPE_SERVICEINTERRUPTION) throw new ServiceInterruption(e.getMessage(),e,currentTime+300000L,currentTime+12*60*60000L,-1,true); else - throw new ACFException(e.getMessage(),e); + throw new ManifoldCFException(e.getMessage(),e); } } /** Get the set of available mime types */ public String[] getMimeTypes() - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { // For now, return the list of mime types we know about return new String[] @@ -2896,7 +2896,7 @@ public class FilenetConnector extends or /** Check connection, with appropriate retries */ protected void checkConnection() - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -2923,13 +2923,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -2978,7 +2978,7 @@ public class FilenetConnector extends or /** Get document class details, with appropriate retries */ protected DocumentClassDefinition[] getDocumentClassesInfo() - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -3005,13 +3005,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -3062,7 +3062,7 @@ public class FilenetConnector extends or /** Get document class metadata fields details, with appropriate retries */ protected MetadataFieldDefinition[] getDocumentClassMetadataFieldsInfo(String documentClassName) - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -3089,13 +3089,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -3147,7 +3147,7 @@ public class FilenetConnector extends or /** Get matching object id's for a given query */ protected String[] doGetMatchingObjectIds(String sql) - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -3174,13 +3174,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -3231,7 +3231,7 @@ public class FilenetConnector extends or } protected Integer doGetDocumentContentCount(String documentIdentifier) - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -3258,13 +3258,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -3319,7 +3319,7 @@ public class FilenetConnector extends or /** Get document info */ protected FileInfo doGetDocumentInformation(String docId, HashMap metadataFields) - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -3346,13 +3346,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); @@ -3402,7 +3402,7 @@ public class FilenetConnector extends or /** Get document contents */ protected void doGetDocumentContents(String docId, int elementNumber, String tempFileName) - throws FilenetException, ACFException, ServiceInterruption + throws FilenetException, ManifoldCFException, ServiceInterruption { while (true) { @@ -3429,13 +3429,13 @@ public class FilenetConnector extends or catch (InterruptedException e) { t.interrupt(); - throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED); + throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED); } catch (RemoteException e) { Throwable e2 = e.getCause(); if (e2 instanceof InterruptedException || e2 instanceof InterruptedIOException) - throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED); + throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED); if (noSession) { currentTime = System.currentTimeMillis(); Modified: incubator/lcf/trunk/modules/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff ============================================================================== --- incubator/lcf/trunk/modules/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java (original) +++ incubator/lcf/trunk/modules/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java Mon Oct 4 14:32:19 2010 @@ -106,7 +106,7 @@ public class FileConnector extends org.a *@return the document uri. */ protected String convertToURI(String documentIdentifier) - throws ACFException + throws ManifoldCFException { // // Note well: This MUST be a legal URI!!! @@ -116,7 +116,7 @@ public class FileConnector extends org.a } catch (java.io.IOException e) { - throw new ACFException("Bad url",e); + throw new ManifoldCFException("Bad url",e); } } @@ -134,7 +134,7 @@ public class FileConnector extends org.a *@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 + throws ManifoldCFException { return new IdentifierStream(spec); } @@ -149,7 +149,7 @@ public class FileConnector extends org.a * will always be processed. */ public String[] getDocumentVersions(String[] documentIdentifiers, DocumentSpecification spec) - throws ACFException, ServiceInterruption + throws ManifoldCFException, ServiceInterruption { String[] rval = new String[documentIdentifiers.length]; int i = 0; @@ -199,7 +199,7 @@ public class FileConnector extends org.a * 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 { int i = 0; while (i < documentIdentifiers.length) @@ -236,7 +236,7 @@ public class FileConnector extends org.a { errorCode = "IO ERROR"; errorDesc = e.getMessage(); - throw new ACFException("IO Error: "+e.getMessage(),e); + throw new ManifoldCFException("IO Error: "+e.getMessage(),e); } } finally @@ -284,7 +284,7 @@ public class FileConnector extends org.a { errorCode = "IO ERROR"; errorDesc = e.getMessage(); - throw new ACFException("IO Error: "+e.getMessage(),e); + throw new ManifoldCFException("IO Error: "+e.getMessage(),e); } } finally @@ -316,7 +316,7 @@ public class FileConnector extends org.a *@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 { out.print( "