You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/10/04 16:32:28 UTC
svn commit: r1004255 [4/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...
Modified: incubator/lcf/trunk/modules/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Mon Oct 4 14:32:19 2010
@@ -31,7 +31,7 @@ import javax.sql.*;
import java.io.*;
import java.util.*;
-/** This interface describes an instance of a connection between a repository and ACF's
+/** This interface describes an instance of a connection between a repository and ManifoldCF's
* standard "pull" ingestion agent.
*
* Each instance of this interface is used in only one thread at a time. Connection Pooling
@@ -90,14 +90,14 @@ public class JDBCConnector extends org.a
/** Set up a session */
protected void getSession()
- throws ACFException
+ throws ManifoldCFException
{
if (connection == null)
{
if (jdbcProvider == null || jdbcProvider.length() == 0)
- throw new ACFException("Missing parameter '"+JDBCConstants.providerParameter+"'");
+ throw new ManifoldCFException("Missing parameter '"+JDBCConstants.providerParameter+"'");
if (host == null || host.length() == 0)
- throw new ACFException("Missing parameter '"+JDBCConstants.hostParameter+"'");
+ throw new ManifoldCFException("Missing parameter '"+JDBCConstants.hostParameter+"'");
connection = new JDBCConnection(jdbcProvider,host,databaseName,userName,password);
}
@@ -149,7 +149,7 @@ public class JDBCConnector extends org.a
/** Check status of connection.
*/
public String check()
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -169,7 +169,7 @@ public class JDBCConnector extends org.a
/** Close the connection. Call this before discarding the repository connector.
*/
public void disconnect()
- throws ACFException
+ throws ManifoldCFException
{
connection = null;
host = null;
@@ -223,7 +223,7 @@ public class JDBCConnector extends org.a
*/
public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime, int jobMode)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
@@ -255,7 +255,7 @@ public class JDBCConnector extends org.a
createQueryString(queryText,paramList), "ERROR", e.getMessage(), null);
throw e;
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// If failure, record the failure.
activities.recordActivity(new Long(startQueryTime), ACTIVITY_EXTERNAL_QUERY, null,
@@ -276,7 +276,7 @@ public class JDBCConnector extends org.a
break;
Object o = row.getValue(JDBCConstants.idReturnColumnName);
if (o == null)
- throw new ACFException("Bad seed query; doesn't return $(IDCOLUMN) column. Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
+ throw new ManifoldCFException("Bad seed query; doesn't return $(IDCOLUMN) column. Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
String idValue = o.toString();
activities.addSeedDocument(idValue);
}
@@ -306,7 +306,7 @@ public class JDBCConnector extends org.a
*/
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
TableSpec ts = new TableSpec(spec);
@@ -363,7 +363,7 @@ public class JDBCConnector extends org.a
{
result = connection.executeUncachedQuery(queryText,paramList,-1);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// If failure, record the failure.
activities.recordActivity(new Long(startTime), ACTIVITY_EXTERNAL_QUERY, null,
@@ -383,7 +383,7 @@ public class JDBCConnector extends org.a
break;
Object o = row.getValue(JDBCConstants.idReturnColumnName);
if (o == null)
- throw new ACFException("Bad version query; doesn't return $(IDCOLUMN) column. Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
+ throw new ManifoldCFException("Bad version query; doesn't return $(IDCOLUMN) column. Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
String idValue = o.toString();
o = row.getValue(JDBCConstants.versionReturnColumnName);
String versionValue;
@@ -432,7 +432,7 @@ public class JDBCConnector 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
{
getSession();
TableSpec ts = new TableSpec(spec);
@@ -475,7 +475,7 @@ public class JDBCConnector extends org.a
{
result = connection.executeUncachedQuery(queryText,paramList,-1);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// If failure, record the failure.
activities.recordActivity(new Long(startTime), ACTIVITY_EXTERNAL_QUERY, null,
@@ -495,7 +495,7 @@ public class JDBCConnector extends org.a
break;
Object o = row.getValue(JDBCConstants.idReturnColumnName);
if (o == null)
- throw new ACFException("Bad document query; doesn't return $(IDCOLUMN) column. Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
+ throw new ManifoldCFException("Bad document query; doesn't return $(IDCOLUMN) column. Try using quotes around $(IDCOLUMN) variable, e.g. \"$(IDCOLUMN)\".");
String id = readAsString(o);
String version = (String)map.get(id);
if (version != null)
@@ -555,15 +555,15 @@ public class JDBCConnector extends org.a
}
catch (java.net.SocketTimeoutException e)
{
- throw new ACFException("Socket timeout reading database data: "+e.getMessage(),e);
+ throw new ManifoldCFException("Socket timeout reading database data: "+e.getMessage(),e);
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
- throw new ACFException("Error reading database data: "+e.getMessage(),e);
+ throw new ManifoldCFException("Error reading database data: "+e.getMessage(),e);
}
finally
{
@@ -595,11 +595,11 @@ public class JDBCConnector extends org.a
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
- throw new ACFException("Error reading database data: "+e.getMessage(),e);
+ throw new ManifoldCFException("Error reading database data: "+e.getMessage(),e);
}
}
}
@@ -654,7 +654,7 @@ public class JDBCConnector 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
{
tabsArray.add("Database Type");
tabsArray.add("Server");
@@ -704,7 +704,7 @@ public class JDBCConnector extends org.a
*@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 jdbcProvider = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.providerParameter);
if (jdbcProvider == null)
@@ -805,7 +805,7 @@ public class JDBCConnector extends org.a
*@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 type = variableContext.getParameter("databasetype");
if (type != null)
@@ -838,7 +838,7 @@ public class JDBCConnector extends org.a
*@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"+
@@ -886,7 +886,7 @@ public class JDBCConnector 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 outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, ArrayList tabsArray)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
tabsArray.add("Queries");
tabsArray.add("Security");
@@ -995,7 +995,7 @@ public class JDBCConnector extends org.a
*@param tabName is the current tab name.
*/
public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
String idQuery = "SELECT idfield AS $(IDCOLUMN) FROM documenttable WHERE modifydatefield > $(STARTTIME) AND modifydatefield <= $(ENDTIME)";
String versionQuery = "SELECT idfield AS $(IDCOLUMN), versionfield AS $(VERSIONCOLUMN) FROM documenttable WHERE idfield IN $(IDLIST)";
@@ -1152,7 +1152,7 @@ public class JDBCConnector extends org.a
*@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 idQuery = variableContext.getParameter("idquery");
String versionQuery = variableContext.getParameter("versionquery");
@@ -1256,7 +1256,7 @@ public class JDBCConnector extends org.a
*@param ds is the current document specification for this job.
*/
public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
String idQuery = "";
String versionQuery = "";
@@ -1360,7 +1360,7 @@ public class JDBCConnector extends org.a
*@param row is the resultset row to use to get the metadata. All non-special columns from this row will be considered to be metadata.
*/
protected void applyMetadata(RepositoryDocument rd, IResultRow row)
- throws ACFException
+ throws ManifoldCFException
{
// Cycle through the row's columns
Iterator iter = row.getColumns();
@@ -1373,7 +1373,7 @@ public class JDBCConnector extends org.a
// We can only accept non-binary metadata at this time.
Object metadata = row.getValue(columnName);
if (metadata instanceof BinaryInput)
- throw new ACFException("Metadata column '"+columnName+"' must be convertible to a string, and cannot be binary");
+ throw new ManifoldCFException("Metadata column '"+columnName+"' must be convertible to a string, and cannot be binary");
rd.addField(columnName,metadata.toString());
}
}
@@ -1385,7 +1385,7 @@ public class JDBCConnector extends org.a
*@param spec is the document specification.
*/
protected void applyAccessTokens(RepositoryDocument rd, String version, DocumentSpecification spec)
- throws ACFException
+ throws ManifoldCFException
{
// Set up any acls
String[] accessAcls = null;
@@ -1500,7 +1500,7 @@ public class JDBCConnector extends org.a
* Each variable substitutes the string, and it also substitutes zero or more query parameters.
*/
protected static void substituteQuery(String inputString, VariableMap inputMap, StringBuffer outputQuery, ArrayList outputParams)
- throws ACFException
+ throws ManifoldCFException
{
// We are looking for strings that look like this: $(something)
// Right at the moment we don't care even about quotes, so we just want to look for $(.
@@ -1522,7 +1522,7 @@ public class JDBCConnector extends org.a
String variableName = inputString.substring(nextIndex+2,endIndex);
VariableMapItem item = inputMap.getVariable(variableName);
if (item == null)
- throw new ACFException("No such substitution variable: $("+variableName+")");
+ throw new ManifoldCFException("No such substitution variable: $("+variableName+")");
outputQuery.append(inputString.substring(startIndex,nextIndex));
outputQuery.append(item.getValue());
ArrayList inputParams = item.getParameters();
@@ -1717,7 +1717,7 @@ public class JDBCConnector extends org.a
/** Make sure we read this field as a string */
protected static String readAsString(Object o)
- throws ACFException
+ throws ManifoldCFException
{
if (o instanceof BinaryInput)
{
@@ -1746,7 +1746,7 @@ public class JDBCConnector extends org.a
}
catch (IOException e)
{
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
finally
{
Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java Mon Oct 4 14:32:19 2010
@@ -22,7 +22,7 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.agents.interfaces.*;
import org.apache.manifoldcf.crawler.interfaces.*;
import org.apache.manifoldcf.crawler.system.Logging;
-import org.apache.manifoldcf.crawler.system.ACF;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
/** Get a livelink connection's information in printed form.
@@ -50,15 +50,15 @@ public class GetConnectionInfo
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
IRepositoryConnection connection = connectionManager.load(connectionName);
if (connection == null)
- throw new ACFException("Connection "+connectionName+" does not exist");
+ throw new ManifoldCFException("Connection "+connectionName+" does not exist");
if (connection.getClassName() == null || !connection.getClassName().equals("org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"))
- throw new ACFException("Command can only be used on working Livelink connections.");
+ throw new ManifoldCFException("Command can only be used on working Livelink connections.");
ConfigParams cfg = connection.getConfigParams();
Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.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 java.io.*;
import java.util.*;
@@ -135,7 +135,7 @@ public class LivelinkAuthority extends o
}
protected void attemptToConnect()
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
if (LLUsers == null)
{
@@ -174,7 +174,7 @@ public class LivelinkAuthority extends o
/** Check connection for sanity.
*/
public String check()
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -203,7 +203,7 @@ public class LivelinkAuthority extends o
{
return "Temporary service interruption: "+e.getMessage();
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
return "Connection failed: "+e.getMessage();
}
@@ -212,7 +212,7 @@ public class LivelinkAuthority extends o
/** Close the connection. Call this before discarding the repository connector.
*/
public void disconnect()
- throws ACFException
+ throws ManifoldCFException
{
if (llServer != null)
{
@@ -235,7 +235,7 @@ public class LivelinkAuthority extends o
* (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
{
// First, do what's necessary to map the user name that comes in to a reasonable
// Livelink domain\\user combination.
@@ -405,7 +405,7 @@ public class LivelinkAuthority extends o
*@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("User Mapping");
@@ -470,7 +470,7 @@ public class LivelinkAuthority extends o
*@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 serverName = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.serverName);
if (serverName == null)
@@ -578,7 +578,7 @@ public class LivelinkAuthority extends o
*@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 serverName = variableContext.getParameter("servername");
if (serverName != null)
@@ -614,7 +614,7 @@ public class LivelinkAuthority extends o
*@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"+
@@ -660,7 +660,7 @@ public class LivelinkAuthority extends o
*@param e is the RuntimeException caught
*/
protected int handleLivelinkRuntimeException(RuntimeException e, int sanityRetryCount)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
if (
e instanceof com.opentext.api.LLHTTPAccessDeniedException ||
@@ -674,7 +674,7 @@ public class LivelinkAuthority extends o
)
{
String details = llServer.getErrors();
- throw new ACFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,ACFException.REPOSITORY_CONNECTION_ERROR);
+ throw new ManifoldCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,ManifoldCFException.REPOSITORY_CONNECTION_ERROR);
}
else if (
e instanceof com.opentext.api.LLBadServerCertificateException ||
@@ -688,14 +688,14 @@ public class LivelinkAuthority extends o
)
{
String details = llServer.getErrors();
- throw new ACFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
+ throw new ManifoldCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
}
else if (e instanceof com.opentext.api.LLIllegalOperationException)
{
// This usually means that LAPI has had a minor communication difficulty but hasn't reported it accurately.
// We *could* throw a ServiceInterruption, but OpenText recommends to just retry almost immediately.
String details = llServer.getErrors();
- return assessRetry(sanityRetryCount,new ACFException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
+ return assessRetry(sanityRetryCount,new ManifoldCFException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
}
else if (e instanceof com.opentext.api.LLIOException)
{
@@ -707,7 +707,7 @@ public class LivelinkAuthority extends o
}
catch (UnknownHostException e2)
{
- throw new ACFException("Server name '"+serverName+"' cannot be resolved",e2);
+ throw new ManifoldCFException("Server name '"+serverName+"' cannot be resolved",e2);
}
throw new ServiceInterruption("Transient error: "+e.getMessage(),e,System.currentTimeMillis()+5*60000L,System.currentTimeMillis()+12*60*60000L,-1,true);
@@ -718,8 +718,8 @@ public class LivelinkAuthority extends o
/** Do a retry, or throw an exception if the retry count has been exhausted
*/
- protected static int assessRetry(int sanityRetryCount, ACFException e)
- throws ACFException
+ protected static int assessRetry(int sanityRetryCount, ManifoldCFException e)
+ throws ManifoldCFException
{
if (sanityRetryCount == 0)
{
@@ -730,11 +730,11 @@ public class LivelinkAuthority extends o
try
{
- ACF.sleep(1000L);
+ ManifoldCF.sleep(1000L);
}
catch (InterruptedException e2)
{
- throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED);
+ throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED);
}
// Exit the method
return sanityRetryCount;
Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Mon Oct 4 14:32:19 2010
@@ -22,7 +22,7 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.agents.interfaces.*;
import org.apache.manifoldcf.crawler.interfaces.*;
import org.apache.manifoldcf.crawler.system.Logging;
-import org.apache.manifoldcf.crawler.system.ACF;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
import java.io.*;
import java.util.*;
@@ -207,7 +207,7 @@ public class LivelinkConnector extends o
LLENTWK_VOL = entinfo.toInteger("VolumeID");
}
else
- throw new ACFException("Error accessing enterprise workspace: "+status);
+ throw new ManifoldCFException("Error accessing enterprise workspace: "+status);
entinfo = new LLValue().setAssoc();
status = LLDocs.AccessCategoryWS(entinfo);
@@ -217,7 +217,7 @@ public class LivelinkConnector extends o
LLCATWK_VOL = entinfo.toInteger("VolumeID");
}
else
- throw new ACFException("Error accessing category workspace: "+status);
+ throw new ManifoldCFException("Error accessing category workspace: "+status);
}
catch (Throwable e)
{
@@ -247,7 +247,7 @@ public class LivelinkConnector extends o
}
protected void getSession()
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
if (hasBeenSetup == false)
{
@@ -303,7 +303,7 @@ public class LivelinkConnector extends o
}
catch (NumberFormatException e)
{
- throw new ACFException("Bad ingest port: "+e.getMessage(),e);
+ throw new ManifoldCFException("Bad ingest port: "+e.getMessage(),e);
}
String viewPortString;
@@ -324,7 +324,7 @@ public class LivelinkConnector extends o
}
catch (NumberFormatException e)
{
- throw new ACFException("Bad view port: "+e.getMessage(),e);
+ throw new ManifoldCFException("Bad view port: "+e.getMessage(),e);
}
if (viewCgiPath == null || viewCgiPath.length() == 0)
@@ -395,8 +395,8 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
- throw (ACFException)thr;
+ else if (thr instanceof ManifoldCFException)
+ throw (ManifoldCFException)thr;
else
throw (Error)thr;
}
@@ -410,7 +410,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e2)
{
@@ -495,7 +495,7 @@ public class LivelinkConnector extends o
/** Check status of connection.
*/
public String check()
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -538,7 +538,7 @@ public class LivelinkConnector extends o
{
// Drop the connection on the floor
method = null;
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (java.net.SocketTimeoutException e)
{
@@ -558,7 +558,7 @@ public class LivelinkConnector extends o
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
@@ -579,9 +579,9 @@ public class LivelinkConnector extends o
{
return "Transient error: "+e.getMessage();
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
- if (e.getErrorCode() == ACFException.INTERRUPTED)
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
throw e;
return "Error: "+e.getMessage();
}
@@ -591,7 +591,7 @@ public class LivelinkConnector extends o
* in active use.
*/
public void poll()
- throws ACFException
+ throws ManifoldCFException
{
if (connectionManager != null)
connectionManager.closeIdleConnections(60000L);
@@ -600,7 +600,7 @@ public class LivelinkConnector extends o
/** Close the connection. Call this before discarding the repository connector.
*/
public void disconnect()
- throws ACFException
+ throws ManifoldCFException
{
llServer.disconnect();
hasBeenSetup = false;
@@ -653,7 +653,7 @@ public class LivelinkConnector extends o
*@return the relative document uri.
*/
protected String convertToIngestURI(String documentIdentifier)
- throws ACFException
+ throws ManifoldCFException
{
// The document identifier is the string form of the object ID for this connector.
if (!documentIdentifier.startsWith("D"))
@@ -672,7 +672,7 @@ public class LivelinkConnector extends o
*@return the document uri.
*/
protected String convertToViewURI(String documentIdentifier)
- throws ACFException
+ throws ManifoldCFException
{
// The document identifier is the string form of the object ID for this connector.
if (!documentIdentifier.startsWith("D"))
@@ -689,7 +689,7 @@ public class LivelinkConnector extends o
*@return the object id, or -1 if documentIdentifier does not describe a document.
*/
protected static int convertToObjectID(String documentIdentifier)
- throws ACFException
+ throws ManifoldCFException
{
if (!documentIdentifier.startsWith("D"))
return -1;
@@ -703,7 +703,7 @@ public class LivelinkConnector extends o
}
catch (NumberFormatException e)
{
- throw new ACFException("Bad document identifier: "+e.getMessage(),e);
+ throw new ManifoldCFException("Bad document identifier: "+e.getMessage(),e);
}
}
@@ -715,7 +715,7 @@ public class LivelinkConnector extends o
*@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("workspaces"))
{
@@ -733,11 +733,11 @@ public class LivelinkConnector extends o
}
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/"))
@@ -758,11 +758,11 @@ public class LivelinkConnector extends o
}
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("categories/"))
@@ -783,11 +783,11 @@ public class LivelinkConnector extends o
}
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);
}
}
@@ -809,11 +809,11 @@ public class LivelinkConnector extends o
}
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
@@ -830,7 +830,7 @@ public class LivelinkConnector extends o
*/
public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
@@ -840,7 +840,7 @@ public class LivelinkConnector extends o
{
// If we get here, it HAS to be a bad network/transient problem.
Logging.connectors.warn("Livelink: Could not look up root workspace object during seeding! Retrying -");
- throw new ServiceInterruption("Service interruption during seeding",new ACFException("Could not looking root workspace object during seeding"),System.currentTimeMillis()+60000L,
+ throw new ServiceInterruption("Service interruption during seeding",new ManifoldCFException("Could not looking root workspace object during seeding"),System.currentTimeMillis()+60000L,
System.currentTimeMillis()+600000L,-1,true);
}
@@ -897,7 +897,7 @@ public class LivelinkConnector extends o
*/
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
@@ -1190,7 +1190,7 @@ public class LivelinkConnector extends o
int status = LLDocs.ListObjects(vol, objID, null, filterString, LAPI_DOCUMENTS.PERM_SEECONTENTS, childrenDocs);
if (status != 0)
{
- throw new ACFException("Error retrieving contents of folder "+Integer.toString(vol)+":"+Integer.toString(objID)+" : Status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
+ throw new ManifoldCFException("Error retrieving contents of folder "+Integer.toString(vol)+":"+Integer.toString(objID)+" : Status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
}
rval = childrenDocs;
}
@@ -1223,7 +1223,7 @@ public class LivelinkConnector extends o
* should only find other references, and should not actually call the ingestion methods.
*/
public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
@@ -1278,9 +1278,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -1348,7 +1348,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -1421,7 +1421,7 @@ public class LivelinkConnector extends o
*@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("Document Access");
@@ -1528,7 +1528,7 @@ public class LivelinkConnector extends o
*@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 ingestProtocol = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.ingestProtocol);
if (ingestProtocol == null)
@@ -1772,7 +1772,7 @@ public class LivelinkConnector extends o
*@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 serverName = variableContext.getParameter("servername");
if (serverName != null)
@@ -1886,7 +1886,7 @@ public class LivelinkConnector extends o
*@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"+
@@ -1934,7 +1934,7 @@ public class LivelinkConnector extends o
*@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("Filters");
@@ -2064,7 +2064,7 @@ public class LivelinkConnector extends o
*@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;
@@ -2133,7 +2133,7 @@ public class LivelinkConnector extends o
pathSoFar = "";
childList = getChildFolderNames("");
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(
" <input type=\"hidden\" name=\"specpath\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathSoFar)+"\"/>\n"+
@@ -2176,7 +2176,7 @@ public class LivelinkConnector extends o
e.printStackTrace();
out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage()));
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage()));
@@ -2548,11 +2548,11 @@ public class LivelinkConnector extends o
categorySoFar = "";
childList = getChildFolderNames("");
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");
}
categoryList = getChildCategoryNames(categorySoFar);
if (categoryList == null)
- throw new ACFException("Can't find any categories for root folder folder");
+ throw new ManifoldCFException("Can't find any categories for root folder folder");
}
}
out.print(
@@ -2668,7 +2668,7 @@ public class LivelinkConnector extends o
e.printStackTrace();
out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage()));
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage()));
@@ -2787,7 +2787,7 @@ public class LivelinkConnector extends o
*@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 xc = variableContext.getParameter("pathcount");
if (xc != null)
@@ -3272,7 +3272,7 @@ public class LivelinkConnector extends o
*@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"+
@@ -3576,7 +3576,7 @@ public class LivelinkConnector extends o
*@return a list of workspace names.
*/
public String[] getWorkspaceNames()
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return new String[]{CATEGORY_NAME,ENTWKSPACE_NAME};
}
@@ -3586,7 +3586,7 @@ public class LivelinkConnector extends o
*@return a list of folder and project names, in sorted order, or null if the path was invalid.
*/
public String[] getChildFolderNames(String pathString)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
return getChildFolders(pathString);
@@ -3598,7 +3598,7 @@ public class LivelinkConnector extends o
*@return a list of category names, in sorted order, or null if the path was invalid.
*/
public String[] getChildCategoryNames(String pathString)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
return getChildCategories(pathString);
@@ -3609,7 +3609,7 @@ public class LivelinkConnector extends o
*@return a list of attribute names, in sorted order, or null of the path was invalid.
*/
public String[] getCategoryAttributes(String pathString)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
getSession();
@@ -3633,7 +3633,7 @@ public class LivelinkConnector extends o
/** Create the login URI. This must be a relative URI.
*/
protected String createLivelinkLoginURI()
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -3651,7 +3651,7 @@ public class LivelinkConnector extends o
}
catch (UnsupportedEncodingException e)
{
- throw new ACFException("Login URI setup error: "+e.getMessage(),e);
+ throw new ManifoldCFException("Login URI setup error: "+e.getMessage(),e);
}
}
@@ -3721,7 +3721,7 @@ public class LivelinkConnector extends o
protected void ingestFromLiveLink(String documentIdentifier, String version,
IProcessActivity activities,
MetadataDescription desc, SystemMetadataDescription sDesc)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
String contextMsg = "for '"+documentIdentifier+"'";
@@ -3854,7 +3854,7 @@ public class LivelinkConnector extends o
case 500:
case 502:
Logging.connectors.warn("Livelink: Service interruption during fetch "+contextMsg+" with Livelink HTTP Server, retrying...");
- throw new ServiceInterruption("Service interruption during fetch",new ACFException(Integer.toString(statusCode)+" error while fetching"),System.currentTimeMillis()+60000L,
+ throw new ServiceInterruption("Service interruption during fetch",new ManifoldCFException(Integer.toString(statusCode)+" error while fetching"),System.currentTimeMillis()+60000L,
System.currentTimeMillis()+600000L,-1,true);
case HttpStatus.SC_UNAUTHORIZED:
@@ -3929,11 +3929,11 @@ public class LivelinkConnector extends o
}
catch (InterruptedException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
@@ -3955,12 +3955,12 @@ public class LivelinkConnector extends o
case HttpStatus.SC_USE_PROXY:
case HttpStatus.SC_GONE:
resultCode = "ERROR "+Integer.toString(statusCode);
- throw new ACFException("Unrecoverable request failure; error = "+Integer.toString(statusCode));
+ throw new ManifoldCFException("Unrecoverable request failure; error = "+Integer.toString(statusCode));
default:
resultCode = "UNKNOWN";
Logging.connectors.warn("Livelink: Attempt to retrieve document from '"+ingestHttpAddress+"' received a response of "+Integer.toString(statusCode)+"; retrying in one minute");
currentTime = System.currentTimeMillis();
- throw new ServiceInterruption("Fetch failed; retrying in 1 minute",new ACFException("Fetch failed with unknown code "+Integer.toString(statusCode)),
+ throw new ServiceInterruption("Fetch failed; retrying in 1 minute",new ManifoldCFException("Fetch failed with unknown code "+Integer.toString(statusCode)),
currentTime+60000L,currentTime+600000L,-1,true);
}
}
@@ -3968,7 +3968,7 @@ public class LivelinkConnector extends o
{
// Drop the connection on the floor
method = null;
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (java.net.SocketTimeoutException e)
{
@@ -4004,13 +4004,13 @@ public class LivelinkConnector extends o
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
resultCode = "EXCEPTION";
resultDescription = e.getMessage();
- throw new ACFException("Exception getting response "+contextMsg+": "+e.getMessage(), e);
+ throw new ManifoldCFException("Exception getting response "+contextMsg+": "+e.getMessage(), e);
}
finally
{
@@ -4024,7 +4024,7 @@ public class LivelinkConnector extends o
catch (IllegalStateException e)
{
Logging.connectors.error("Livelink: State exception dealing with '"+ingestHttpAddress+"': "+e.getMessage(),e);
- throw new ACFException("State exception dealing with '"+ingestHttpAddress+"': "+e.getMessage(),e);
+ throw new ManifoldCFException("State exception dealing with '"+ingestHttpAddress+"': "+e.getMessage(),e);
}
}
@@ -4040,7 +4040,7 @@ public class LivelinkConnector extends o
/** Initialize a livelink client connection */
protected HttpClient getInitializedClient(String contextMsg)
- throws ServiceInterruption, ACFException
+ throws ServiceInterruption, ManifoldCFException
{
HttpClient client = new HttpClient(connectionManager);
client.getParams().setParameter(org.apache.commons.httpclient.params.HttpClientParams.PROTOCOL_FACTORY,myFactory);
@@ -4074,7 +4074,7 @@ public class LivelinkConnector extends o
{
Logging.connectors.warn("Livelink: Service interruption during authentication "+contextMsg+" with Livelink HTTP Server, retrying...");
currentTime = System.currentTimeMillis();
- throw new ServiceInterruption("502 error during authentication",new ACFException("502 error while authenticating"),
+ throw new ServiceInterruption("502 error during authentication",new ManifoldCFException("502 error while authenticating"),
currentTime+60000L,currentTime+600000L,-1,true);
}
if (statusCode != HttpStatus.SC_OK)
@@ -4082,9 +4082,9 @@ public class LivelinkConnector extends o
Logging.connectors.error("Livelink: Failed to authenticate "+contextMsg+" against Livelink HTTP Server; Status code: " + statusCode);
// Ok, so we didn't get in - simply do not ingest
if (statusCode == HttpStatus.SC_UNAUTHORIZED)
- throw new ACFException("Session authorization failed with a 401 code; are credentials correct?");
+ throw new ManifoldCFException("Session authorization failed with a 401 code; are credentials correct?");
else
- throw new ACFException("Session authorization failed with code "+Integer.toString(statusCode));
+ throw new ManifoldCFException("Session authorization failed with code "+Integer.toString(statusCode));
}
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Retrieving authentication response "+contextMsg+"");
@@ -4097,7 +4097,7 @@ public class LivelinkConnector extends o
{
// Drop the connection on the floor
authget = null;
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (java.net.SocketTimeoutException e)
{
@@ -4125,12 +4125,12 @@ public class LivelinkConnector extends o
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
Logging.connectors.error("Livelink: IO exception when authenticating to the Livelink HTTP Server "+contextMsg+": "+e.getMessage(), e);
- throw new ACFException("Unable to communicate with the Livelink HTTP Server: "+e.getMessage(), e);
+ throw new ManifoldCFException("Unable to communicate with the Livelink HTTP Server: "+e.getMessage(), e);
}
finally
@@ -4142,7 +4142,7 @@ public class LivelinkConnector extends o
catch (IllegalStateException e)
{
Logging.connectors.error("Livelink: State exception dealing with '"+createLivelinkLoginURI()+"'",e);
- throw new ACFException("State exception dealing with login URI: "+e.getMessage(),e);
+ throw new ManifoldCFException("State exception dealing with login URI: "+e.getMessage(),e);
}
return client;
@@ -4277,7 +4277,7 @@ public class LivelinkConnector extends o
*@return a list of folder and project names, in sorted order, or null if the path was invalid.
*/
protected String[] getChildFolders(String pathString)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
RootValue rv = new RootValue(pathString);
@@ -4302,9 +4302,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4325,7 +4325,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -4341,7 +4341,7 @@ public class LivelinkConnector extends o
*@return a list of category names, in sorted order, or null if the path was invalid.
*/
protected String[] getChildCategories(String pathString)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Start at root
RootValue rv = new RootValue(pathString);
@@ -4367,9 +4367,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4390,7 +4390,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -4428,14 +4428,14 @@ public class LivelinkConnector extends o
return;
if (status != 0)
{
- throw new ACFException("Error getting category version: "+Integer.toString(status));
+ throw new ManifoldCFException("Error getting category version: "+Integer.toString(status));
}
LLValue children = new LLValue();
status = LLAttributes.AttrListNames(catVersion,null,children);
if (status != 0)
{
- throw new ACFException("Error getting attribute names: "+Integer.toString(status));
+ throw new ManifoldCFException("Error getting attribute names: "+Integer.toString(status));
}
rval = children;
}
@@ -4462,7 +4462,7 @@ public class LivelinkConnector extends o
*@return a list of attribute names, in sorted order, or null of the path was invalid.
*/
protected String[] getCategoryAttributes(int catObjectID)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int sanityRetryCount = FAILURE_RETRY_COUNT;
while (true)
@@ -4477,9 +4477,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4505,7 +4505,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -4555,7 +4555,7 @@ public class LivelinkConnector extends o
if (status != 0)
{
- throw new ACFException("Error retrieving category version: "+Integer.toString(status)+": "+llServer.getErrors());
+ throw new ManifoldCFException("Error retrieving category version: "+Integer.toString(status)+": "+llServer.getErrors());
}
rval = rvalue;
@@ -4581,7 +4581,7 @@ public class LivelinkConnector extends o
/** Get a category version for document.
*/
protected LLValue getCatVersion(int objID, int catID)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int sanityRetryCount = FAILURE_RETRY_COUNT;
while (true)
@@ -4596,9 +4596,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4609,7 +4609,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (NullPointerException npe)
{
@@ -4661,7 +4661,7 @@ public class LivelinkConnector extends o
if (status != 0)
{
- throw new ACFException("Error retrieving attribute value: "+Integer.toString(status)+": "+llServer.getErrors());
+ throw new ManifoldCFException("Error retrieving attribute value: "+Integer.toString(status)+": "+llServer.getErrors());
}
rval = children;
}
@@ -4685,7 +4685,7 @@ public class LivelinkConnector extends o
/** Get an attribute value from a category version.
*/
protected String[] getAttributeValue(LLValue categoryVersion, String attributeName)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int sanityRetryCount = FAILURE_RETRY_COUNT;
while (true)
@@ -4700,9 +4700,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4726,7 +4726,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -4763,7 +4763,7 @@ public class LivelinkConnector extends o
if (status != 0)
{
- throw new ACFException("Error retrieving document rights: "+Integer.toString(status)+": "+llServer.getErrors());
+ throw new ManifoldCFException("Error retrieving document rights: "+Integer.toString(status)+": "+llServer.getErrors());
}
rval = childrenObjects;
@@ -4792,7 +4792,7 @@ public class LivelinkConnector extends o
*@return the array.
*/
protected int[] getObjectRights(int vol, int objID)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int sanityRetryCount = FAILURE_RETRY_COUNT;
while (true)
@@ -4807,9 +4807,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4862,7 +4862,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -4914,7 +4914,7 @@ public class LivelinkConnector extends o
if (status != 0)
{
- throw new ACFException("Error retrieving document object "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
+ throw new ManifoldCFException("Error retrieving document object "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
}
rval = objinfo;
}
@@ -4943,7 +4943,7 @@ public class LivelinkConnector extends o
* @return LLValue the LAPI value object, or null if object has been deleted (or doesn't exist)
*/
protected LLValue getObjectInfo(int vol, int id)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int sanityRetryCount = FAILURE_RETRY_COUNT;
while (true)
@@ -4960,9 +4960,9 @@ public class LivelinkConnector extends o
throw (RuntimeException)thr;
else if (thr instanceof ServiceInterruption)
throw (ServiceInterruption)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -4973,7 +4973,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -4985,7 +4985,7 @@ public class LivelinkConnector extends o
/** Build a set of actual acls given a set of rights */
protected String[] lookupTokens(int[] rights, int vol, int objID)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
String[] convertedAcls = new String[rights.length];
@@ -5056,7 +5056,7 @@ public class LivelinkConnector extends o
/** Get an object's standard path, given its ID.
*/
protected String getObjectPath(int id)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int objectId = id;
String path = null;
@@ -5136,7 +5136,7 @@ public class LivelinkConnector extends o
if (status != 0)
{
- throw new ACFException("Error retrieving document categories for "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
+ throw new ManifoldCFException("Error retrieving document categories for "+Integer.toString(vol)+":"+Integer.toString(id)+": status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
}
rval = catIDList;
}
@@ -5163,7 +5163,7 @@ public class LivelinkConnector extends o
* @return an array of integers containing category identifiers, or null if the object is not found.
*/
protected int[] getObjectCategoryIDs(int vol, int id)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
int sanityRetryCount = FAILURE_RETRY_COUNT;
while (true)
@@ -5178,9 +5178,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -5235,7 +5235,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -5248,7 +5248,7 @@ public class LivelinkConnector extends o
/** RootValue version of getPathId.
*/
protected VolumeAndId getPathId(RootValue rv)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getPathId(rv.getRootValue(),rv.getRemainderPath());
}
@@ -5259,7 +5259,7 @@ public class LivelinkConnector extends o
* @param startPath is the folder name (a string with dots as separators)
*/
protected VolumeAndId getPathId(LLValue objInfo, String startPath)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Grab the volume ID and starting object
int obj = objInfo.toInteger("ID");
@@ -5303,9 +5303,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -5339,7 +5339,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -5356,7 +5356,7 @@ public class LivelinkConnector extends o
/** Rootvalue version of getCategoryId.
*/
protected int getCategoryId(RootValue rv)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getCategoryId(rv.getRootValue(),rv.getRemainderPath());
}
@@ -5367,7 +5367,7 @@ public class LivelinkConnector extends o
* @param startPath is the folder name, ending in a category name (a string with slashes as separators)
*/
protected int getCategoryId(LLValue objInfo, String startPath)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Grab the volume ID and starting object
int obj = objInfo.toInteger("ID");
@@ -5420,9 +5420,9 @@ public class LivelinkConnector extends o
{
if (thr instanceof RuntimeException)
throw (RuntimeException)thr;
- else if (thr instanceof ACFException)
+ else if (thr instanceof ManifoldCFException)
{
- sanityRetryCount = assessRetry(sanityRetryCount,(ACFException)thr);
+ sanityRetryCount = assessRetry(sanityRetryCount,(ManifoldCFException)thr);
continue;
}
else
@@ -5456,7 +5456,7 @@ public class LivelinkConnector extends o
catch (InterruptedException e)
{
t.interrupt();
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (RuntimeException e)
{
@@ -5565,7 +5565,7 @@ public class LivelinkConnector extends o
*@return true if it should be included.
*/
protected static boolean checkInclude(String filename, DocumentSpecification documentSpecification)
- throws ACFException
+ throws ManifoldCFException
{
// Scan includes to insure we match
int i = 0;
@@ -5609,7 +5609,7 @@ public class LivelinkConnector extends o
*@param documentSpecification is the specification.
*/
protected boolean checkIngest(int objID, DocumentSpecification documentSpecification)
- throws ACFException
+ throws ManifoldCFException
{
// Since the only exclusions at this point are not based on file contents, this is a no-op.
return true;
@@ -5804,7 +5804,7 @@ public class LivelinkConnector extends o
/** Constructor */
public SystemMetadataDescription(DocumentSpecification spec)
- throws ACFException
+ throws ManifoldCFException
{
pathAttributeName = null;
int i = 0;
@@ -5833,7 +5833,7 @@ public class LivelinkConnector extends o
/** Given an identifier, get the translated string that goes into the metadata.
*/
public String getPathAttributeValue(String documentIdentifier)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
String path = getNodePathString(documentIdentifier);
if (path == null)
@@ -5844,7 +5844,7 @@ public class LivelinkConnector extends o
/** For a given node, get its path.
*/
public String getNodePathString(String documentIdentifier)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Looking up path for '"+documentIdentifier+"'");
@@ -5880,7 +5880,7 @@ public class LivelinkConnector extends o
}
catch (NumberFormatException e)
{
- throw new ACFException("Bad document identifier: "+e.getMessage(),e);
+ throw new ManifoldCFException("Bad document identifier: "+e.getMessage(),e);
}
// Load the object
@@ -5936,7 +5936,7 @@ public class LivelinkConnector extends o
*@return an iterator over MetadataItem objects.
*/
public Iterator getItems(ArrayList metadataItems)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// This is the map that will be iterated over for a return value.
// It gets built out of (hopefully cached) data from categoryMap.
@@ -6015,7 +6015,7 @@ public class LivelinkConnector extends o
/** Get a specified set of packed category paths with attribute names, given the category identifiers */
public String[] getCategoryPathsAttributeNames(int[] catIDs)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
HashMap set = new HashMap();
int i = 0;
@@ -6062,14 +6062,14 @@ public class LivelinkConnector extends o
/** Find a category path given a category ID */
protected String findPath(int catID)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getObjectPath(catID);
}
/** Find a set of attributes given a category ID */
protected String[] findAttributes(int catID)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getCategoryAttributes(catID);
}
@@ -6117,7 +6117,7 @@ public class LivelinkConnector extends o
*@return the root node.
*/
public LLValue getRootValue()
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
if (rootValue == null)
{
@@ -6126,12 +6126,12 @@ public class LivelinkConnector extends o
else if (workspaceName.equals(ENTWKSPACE_NAME))
rootValue = getObjectInfo(LLENTWK_VOL,LLENTWK_ID);
else
- throw new ACFException("Bad workspace name: "+workspaceName);
+ throw new ManifoldCFException("Bad workspace name: "+workspaceName);
if (rootValue == null)
{
Logging.connectors.warn("Livelink: Could not get workspace/volume ID! Retrying...");
// This cannot mean a real failure; it MUST mean that we have had an intermittent communication hiccup. So, pass it off as a service interruption.
- throw new ServiceInterruption("Service interruption getting root value",new ACFException("Could not get workspace/volume id"),System.currentTimeMillis()+60000L,
+ throw new ServiceInterruption("Service interruption getting root value",new ManifoldCFException("Could not get workspace/volume id"),System.currentTimeMillis()+60000L,
System.currentTimeMillis()+600000L,-1,true);
}
}
@@ -6253,7 +6253,7 @@ public class LivelinkConnector extends o
*@param failIfTimeout is true if, for transient conditions, we want to signal failure if the timeout condition is acheived.
*/
protected int handleLivelinkRuntimeException(RuntimeException e, int sanityRetryCount, boolean failIfTimeout)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
if (
e instanceof com.opentext.api.LLHTTPAccessDeniedException ||
@@ -6267,7 +6267,7 @@ public class LivelinkConnector extends o
)
{
String details = llServer.getErrors();
- throw new ACFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,ACFException.REPOSITORY_CONNECTION_ERROR);
+ throw new ManifoldCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e,ManifoldCFException.REPOSITORY_CONNECTION_ERROR);
}
else if (
e instanceof com.opentext.api.LLBadServerCertificateException ||
@@ -6282,14 +6282,14 @@ public class LivelinkConnector extends o
{
String details = llServer.getErrors();
- throw new ACFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
+ throw new ManifoldCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
}
else if (e instanceof com.opentext.api.LLIllegalOperationException)
{
// This usually means that LAPI has had a minor communication difficulty but hasn't reported it accurately.
// We *could* throw a ServiceInterruption, but OpenText recommends to just retry almost immediately.
String details = llServer.getErrors();
- return assessRetry(sanityRetryCount,new ACFException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
+ return assessRetry(sanityRetryCount,new ManifoldCFException("Livelink API illegal operation error: "+e.getMessage()+((details==null)?"":"; "+details),e));
}
else if (e instanceof com.opentext.api.LLIOException)
{
@@ -6303,7 +6303,7 @@ public class LivelinkConnector extends o
}
catch (UnknownHostException e2)
{
- throw new ACFException("Server name '"+serverName+"' cannot be resolved",e2);
+ throw new ManifoldCFException("Server name '"+serverName+"' cannot be resolved",e2);
}
long currentTime = System.currentTimeMillis();
@@ -6315,8 +6315,8 @@ public class LivelinkConnector extends o
/** Do a retry, or throw an exception if the retry count has been exhausted
*/
- protected static int assessRetry(int sanityRetryCount, ACFException e)
- throws ACFException
+ protected static int assessRetry(int sanityRetryCount, ManifoldCFException e)
+ throws ManifoldCFException
{
if (sanityRetryCount == 0)
{
@@ -6327,11 +6327,11 @@ public class LivelinkConnector extends o
try
{
- ACF.sleep(1000L);
+ ManifoldCF.sleep(1000L);
}
catch (InterruptedException e2)
{
- throw new ACFException(e2.getMessage(),e2,ACFException.INTERRUPTED);
+ throw new ManifoldCFException(e2.getMessage(),e2,ManifoldCFException.INTERRUPTED);
}
// Exit the method
return sanityRetryCount;
Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/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/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/LogicalServer.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/LogicalServer.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/LogicalServer.java (original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/LogicalServer.java Mon Oct 4 14:32:19 2010
@@ -34,13 +34,13 @@ class LogicalServer{
private String servername;
private String prefix;
- private ACFMemexConnection mie;
+ private ManifoldCFMemexConnection mie;
private RegistryEntry[] databases;
private boolean active = false;
private Map<String,RegistryEntry> databasesByName = new HashMap<String,RegistryEntry>();
private Map<String,Map<String,DatabaseField>> fieldsByDatabaseName = new HashMap<String,Map<String,DatabaseField>>();
- public LogicalServer(String name, String urnPrefix, ACFMemexConnection serverMIE, Map<String,MemexEntity> entitiesByName)
+ public LogicalServer(String name, String urnPrefix, ManifoldCFMemexConnection serverMIE, Map<String,MemexEntity> entitiesByName)
throws MemexException
{
servername = name;
@@ -93,7 +93,7 @@ class LogicalServer{
return prefix;
}
- public ACFMemexConnection getMIE()
+ public ManifoldCFMemexConnection getMIE()
{
return mie;
}
Added: incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/ManifoldCFMemexConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/ManifoldCFMemexConnection.java?rev=1004255&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/ManifoldCFMemexConnection.java (added)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/ManifoldCFMemexConnection.java Mon Oct 4 14:32:19 2010
@@ -0,0 +1,77 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+/*
+* To change this template, choose Tools | Templates
+* and open the template in the editor.
+*/
+
+package org.apache.manifoldcf.crawler.connectors.memex;
+
+import com.memex.mie.*;
+
+
+/**
+*
+* @author mxadmin
+*/
+class ManifoldCFMemexConnection{
+
+ /**Class to extend the regular MemexConnection to deal with
+ * the fact the ManifoldCF connect method doesn't report authentication
+ * failure immediately.
+ */
+
+ protected String ConnectionMessage = "No connection attempted";
+ protected RegistryEntry[] localRegistry = null;
+ protected MemexConnection mie = null;
+ protected String name = "";
+ protected long checkExpireTime = -1L;
+
+
+ ManifoldCFMemexConnection(){
+
+ }
+
+ protected boolean isConnected(){
+
+ try{
+ if(mie.isConnected()){
+ long currentTime = System.currentTimeMillis();
+ if (checkExpireTime == -1L || currentTime >= checkExpireTime)
+ {
+ String mytest = mie.mxie_environment_get("MXIE_CURRENT_USER");
+ // Don't try this again for at least a minute; it's unnecessary and way too slow
+ checkExpireTime = currentTime + 60000L;
+ }
+ return true;
+ }else{
+ checkExpireTime = -1L;
+ return false;
+ }
+ }
+ catch(MemexException mex){
+ checkExpireTime = -1L;
+ return false;
+ }
+ catch(java.lang.NullPointerException e){
+ checkExpireTime = -1L;
+ return false;
+ }
+ }
+
+}