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 [24/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/manifoldc...
Modified: incubator/lcf/trunk/tests/crawler-testing-package/org/apache/manifoldcf/crawler/ResetAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/crawler-testing-package/org/apache/manifoldcf/crawler/ResetAll.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/crawler-testing-package/org/apache/manifoldcf/crawler/ResetAll.java (original)
+++ incubator/lcf/trunk/tests/crawler-testing-package/org/apache/manifoldcf/crawler/ResetAll.java Mon Oct 4 14:32:19 2010
@@ -45,7 +45,7 @@ public class ResetAll
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connMgr = RepositoryConnectionManagerFactory.make(tc);
@@ -62,7 +62,7 @@ public class ResetAll
{
jobManager.manualAbort(desc.getID());
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// This generally means that the job was not running
}
@@ -85,7 +85,7 @@ public class ResetAll
case JobStatus.JOBSTATUS_ERROR:
break;
default:
- ACF.sleep(10000);
+ ManifoldCF.sleep(10000);
continue;
}
}
@@ -102,7 +102,7 @@ public class ResetAll
{
jobManager.deleteJob(desc.getID());
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// This usually means that the job is already being deleted
}
@@ -118,7 +118,7 @@ public class ResetAll
JobStatus status = jobManager.getStatus(desc.getID());
if (status != null)
{
- ACF.sleep(10000);
+ ManifoldCF.sleep(10000);
continue;
}
break;
Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/AddDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/AddDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/AddDoc.java (original)
+++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/AddDoc.java Mon Oct 4 14:32:19 2010
@@ -86,7 +86,7 @@ public class AddDoc
e.printStackTrace(System.err);
System.exit(2);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/LookupDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/LookupDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/LookupDoc.java (original)
+++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/LookupDoc.java Mon Oct 4 14:32:19 2010
@@ -63,7 +63,7 @@ public class LookupDoc
}
System.err.println("Successfully looked up");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/RemoveDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/RemoveDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/RemoveDoc.java (original)
+++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/RemoveDoc.java Mon Oct 4 14:32:19 2010
@@ -52,7 +52,7 @@ public class RemoveDoc
System.err.println("Successfully removed");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/UpdateDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/UpdateDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/UpdateDoc.java (original)
+++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/manifoldcf/crawler/connectors/jdbc/UpdateDoc.java Mon Oct 4 14:32:19 2010
@@ -75,7 +75,7 @@ public class UpdateDoc
e.printStackTrace(System.err);
System.exit(2);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDoc.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDoc.java Mon Oct 4 14:32:19 2010
@@ -51,7 +51,7 @@ public class AddDoc
}
System.err.println("Successfully added");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDocRights.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDocRights.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDocRights.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/AddDocRights.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class AddDocRights
}
System.err.println("Successfully added rights");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkSupport.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkSupport.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkSupport.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkSupport.java Mon Oct 4 14:32:19 2010
@@ -57,7 +57,7 @@ public class LiveLinkSupport
/** Constructor.
*/
public LiveLinkSupport(String serverName, int serverPort, String serverUserName, String serverPassword)
- throws ACFException
+ throws ManifoldCFException
{
llServer = new LLSERVER(serverName,serverPort,serverUserName,serverPassword);
@@ -88,14 +88,14 @@ public class LiveLinkSupport
}
catch (Exception e)
{
- throw new ACFException("Connection failed: "+e.getMessage()+"; Details: "+llServer.getErrors(), e, ACFException.SETUP_ERROR);
+ throw new ManifoldCFException("Connection failed: "+e.getMessage()+"; Details: "+llServer.getErrors(), e, ManifoldCFException.SETUP_ERROR);
}
}
/** Close the connection. Call this before discarding the repository connector.
*/
public void close()
- throws ACFException
+ throws ManifoldCFException
{
llServer.disconnect();
llServer = null;
@@ -106,7 +106,7 @@ public class LiveLinkSupport
/** Look up a document.
*/
public String lookupDocument(String LLpathString)
- throws ACFException
+ throws ManifoldCFException
{
VolumeAndId volID = findPath(LLpathString);
if (volID == null)
@@ -121,7 +121,7 @@ public class LiveLinkSupport
/** Add a document.
*/
public String addDocument(String LLpathString, String name, String filename)
- throws ACFException
+ throws ManifoldCFException
{
VolumeAndId volID = findPath(LLpathString + "/" + name);
if (volID == null)
@@ -129,7 +129,7 @@ public class LiveLinkSupport
// Add document
volID = findPath(LLpathString);
if (volID == null)
- throw new ACFException("No such path: '"+LLpathString+"'");
+ throw new ManifoldCFException("No such path: '"+LLpathString+"'");
LLValue objInfo = new LLValue().setAssocNotSet();
LLValue versionInfo = new LLValue().setAssocNotSet();
@@ -138,7 +138,7 @@ public class LiveLinkSupport
if ( status != 0 )
{
- throw new ACFException("Error adding document: "+llServer.getErrors());
+ throw new ManifoldCFException("Error adding document: "+llServer.getErrors());
}
return Integer.toString(objInfo.toInteger( "ID" ));
@@ -152,7 +152,7 @@ public class LiveLinkSupport
if ( status != 0 )
{
- throw new ACFException("Error updating document: "+llServer.getErrors());
+ throw new ManifoldCFException("Error updating document: "+llServer.getErrors());
}
return Integer.toString(volID.getPathId());
@@ -162,7 +162,7 @@ public class LiveLinkSupport
/** Delete a document.
*/
public void deleteDocument(String LLpathString)
- throws ACFException
+ throws ManifoldCFException
{
VolumeAndId volID = findPath(LLpathString);
if (volID == null)
@@ -174,18 +174,18 @@ public class LiveLinkSupport
if ( status != 0 )
{
- throw new ACFException("Error deleting document: "+llServer.getErrors());
+ throw new ManifoldCFException("Error deleting document: "+llServer.getErrors());
}
}
/** Modify a document.
*/
public String modifyDocument(String LLpathString, String filename)
- throws ACFException
+ throws ManifoldCFException
{
VolumeAndId volID = findPath(LLpathString);
if (volID == null)
- throw new ACFException("No such path: '"+LLpathString+"'");
+ throw new ManifoldCFException("No such path: '"+LLpathString+"'");
// Add document
LLValue versionInfo = new LLValue().setAssocNotSet();
@@ -194,7 +194,7 @@ public class LiveLinkSupport
if ( status != 0 )
{
- throw new ACFException("Error updating document: "+llServer.getErrors());
+ throw new ManifoldCFException("Error updating document: "+llServer.getErrors());
}
return Integer.toString(volID.getPathId());
@@ -204,11 +204,11 @@ public class LiveLinkSupport
/** Add metadata value for a document.
*/
public void setMetadataValue(String LLpathString, String categoryPathString, String attributeName, String attributeValue)
- throws ACFException
+ throws ManifoldCFException
{
VolumeAndId volID = findPath(LLpathString);
if (volID == null)
- throw new ACFException("No such path: '"+LLpathString+"'");
+ throw new ManifoldCFException("No such path: '"+LLpathString+"'");
// Start at root
RootValue rv = new RootValue(categoryPathString);
@@ -216,7 +216,7 @@ public class LiveLinkSupport
// Get the object id of the category the path describes
int catObjectID = getCategoryId(rv);
if (catObjectID == -1)
- throw new ACFException("No such category: '"+categoryPathString+"'");
+ throw new ManifoldCFException("No such category: '"+categoryPathString+"'");
try
{
@@ -237,11 +237,11 @@ public class LiveLinkSupport
int status = LLDocs.FetchCategoryVersion(catIDValue,rvalue);
// If either the object is wrong, or the object does not have the specified category, return null.
if (status == 103101 || status == 107205)
- throw new ACFException("Can't fetch category attributes for category "+Integer.toString(catObjectID));
+ throw new ManifoldCFException("Can't fetch category attributes for category "+Integer.toString(catObjectID));
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());
}
// Now, try to set the revised value
@@ -253,39 +253,39 @@ public class LiveLinkSupport
if (status != 0)
{
- throw new ACFException("Error setting attribute value: "+Integer.toString(status)+": "+llServer.getErrors());
+ throw new ManifoldCFException("Error setting attribute value: "+Integer.toString(status)+": "+llServer.getErrors());
}
status = LLDocs.SetObjectAttributesEx(objIDValue,rvalue);
// If either the object is wrong, or the object does not have the specified category, return null.
if (status == 103101 || status == 107205)
- throw new ACFException("Can't set attributes for object "+Integer.toString(volID.getPathId())+
+ throw new ManifoldCFException("Can't set attributes for object "+Integer.toString(volID.getPathId())+
" category "+Integer.toString(catObjectID));
if (status != 0)
{
- throw new ACFException("Error setting category version: "+Integer.toString(status)+": "+llServer.getErrors());
+ throw new ManifoldCFException("Error setting category version: "+Integer.toString(status)+": "+llServer.getErrors());
}
}
catch (com.opentext.api.LLIllegalOperationException e)
{
- throw new ACFException("Livelink: Unexpected illegal operation error: "+e.getMessage(),e);
+ throw new ManifoldCFException("Livelink: Unexpected illegal operation error: "+e.getMessage(),e);
}
catch (com.opentext.api.LLIOException e)
{
// Server went down. Throw a service interruption, and try again in 5 minutes.
- throw new ACFException("IO Exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("IO Exception: "+e.getMessage(),e);
}
}
/** Add see/seecontent rights for a user for a document.
*/
public void addDocumentRights(String LLpathString, String userName, String domainName)
- throws ACFException
+ throws ManifoldCFException
{
VolumeAndId volID = findPath(LLpathString);
if (volID == null)
- throw new ACFException("No such path: '"+LLpathString+"'");
+ throw new ManifoldCFException("No such path: '"+LLpathString+"'");
int userID;
LLValue userInfo = new LLValue().setAssocNotSet();
@@ -295,7 +295,7 @@ public class LiveLinkSupport
{
int status = LLUsers.GetUserInfoEx(userName,domainName,userInfo);
if (status != 0)
- throw new ACFException("Error getting user info: "+llServer.getErrors());
+ throw new ManifoldCFException("Error getting user info: "+llServer.getErrors());
userID = userInfo.toInteger("ID");
// First, remove right of the world to see this document
status = LLDocs.SetObjectRight(volID.getVolumeID(),volID.getPathId(),
@@ -313,16 +313,16 @@ public class LiveLinkSupport
status = LLDocs.SetObjectRight(volID.getVolumeID(),volID.getPathId(),
LAPI_DOCUMENTS.RIGHT_UPDATE,userID,LAPI_DOCUMENTS.PERM_SEE | LAPI_DOCUMENTS.PERM_SEECONTENTS, 0);
if (status != 0)
- throw new ACFException("Error setting permissions: "+llServer.getErrors());
+ throw new ManifoldCFException("Error setting permissions: "+llServer.getErrors());
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
throw e;
}
catch (Exception e)
{
- throw new ACFException("Exception looking up user '"+userName+"'",e);
+ throw new ManifoldCFException("Exception looking up user '"+userName+"'",e);
}
}
@@ -332,7 +332,7 @@ public class LiveLinkSupport
/** Get the volume and id, given a qualified path.
*/
protected VolumeAndId findPath(String pathString)
- throws ACFException
+ throws ManifoldCFException
{
RootValue rv = new RootValue(pathString);
@@ -346,7 +346,7 @@ public class LiveLinkSupport
/** Rootvalue version of getCategoryId.
*/
protected int getCategoryId(RootValue rv)
- throws ACFException
+ throws ManifoldCFException
{
return getCategoryId(rv.getRootValue(),rv.getRemainderPath());
}
@@ -357,7 +357,7 @@ public class LiveLinkSupport
* @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
+ throws ManifoldCFException
{
// This is where the results go
LLValue children = (new LLValue());
@@ -404,7 +404,7 @@ public class LiveLinkSupport
{
int status = LLDocs.ListObjects(vol, obj, null, filterString, LAPI_DOCUMENTS.PERM_SEECONTENTS, children);
if (status != 0)
- throw new ACFException("Error finding category children: "+Integer.toString(status)+": "+llServer.getErrors());
+ throw new ManifoldCFException("Error finding category children: "+Integer.toString(status)+": "+llServer.getErrors());
// If there is one child, then we are okay.
if (children.size() == 1)
@@ -422,17 +422,17 @@ public class LiveLinkSupport
{
// Couldn't find the path. Instead of throwing up, return null to indicate
// illegal node.
- throw new ACFException("Error: no children!");
+ throw new ManifoldCFException("Error: no children!");
}
}
catch (com.opentext.api.LLIllegalOperationException e)
{
- throw new ACFException("Livelink: Unexpected illegal operation error: "+e.getMessage(),e);
+ throw new ManifoldCFException("Livelink: Unexpected illegal operation error: "+e.getMessage(),e);
}
catch (com.opentext.api.LLIOException e)
{
// Server went down. Throw a service interruption, and try again in 5 minutes.
- throw new ACFException("IO exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
}
}
return obj;
@@ -445,7 +445,7 @@ public class LiveLinkSupport
* @param id the object ID
* @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
+ protected LLValue getObjectInfo(int vol, int id) throws ManifoldCFException
{
LLValue objinfo = new LLValue().setAssocNotSet();
int status = LLDocs.GetObjectInfo(vol,id,objinfo);
@@ -454,7 +454,7 @@ public class LiveLinkSupport
return null;
if (status != 0)
- throw new ACFException("Error retrieving document object: "+llServer.getErrors());
+ throw new ManifoldCFException("Error retrieving document object: "+llServer.getErrors());
return objinfo;
}
@@ -462,7 +462,7 @@ public class LiveLinkSupport
/** RootValue version of getPathId.
*/
protected VolumeAndId getPathId(RootValue rv)
- throws ACFException
+ throws ManifoldCFException
{
return getPathId(rv.getRootValue(),rv.getRemainderPath());
}
@@ -473,7 +473,7 @@ public class LiveLinkSupport
* @param startPath is the folder name (a string with dots as separators)
*/
protected VolumeAndId getPathId(LLValue objInfo, String startPath)
- throws ACFException
+ throws ManifoldCFException
{
// This is where the results go
LLValue children = (new LLValue());
@@ -502,7 +502,7 @@ public class LiveLinkSupport
int status = LLDocs.ListObjects(vol, obj, null, filterString, LAPI_DOCUMENTS.PERM_SEECONTENTS, children);
if (status != 0)
- throw new ACFException("Error finding start node path: "+llServer.getErrors());
+ throw new ManifoldCFException("Error finding start node path: "+llServer.getErrors());
// If there is one child, then we are okay.
if (children.size() == 1)
@@ -597,7 +597,7 @@ public class LiveLinkSupport
*@return the root node.
*/
public LLValue getRootValue()
- throws ACFException
+ throws ManifoldCFException
{
if (rootValue == null)
{
@@ -606,9 +606,9 @@ public class LiveLinkSupport
else if (workspaceName.equals(ENTWKSPACE_NAME))
rootValue = getObjectInfo(LLENTWK_VOL,LLENTWK_ID);
else
- throw new ACFException("Bad workspace name");
+ throw new ManifoldCFException("Bad workspace name");
if (rootValue == null)
- throw new ACFException("Could not get workspace/volume ID");
+ throw new ManifoldCFException("Could not get workspace/volume ID");
}
return rootValue;
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LookupDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LookupDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LookupDoc.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/LookupDoc.java Mon Oct 4 14:32:19 2010
@@ -51,7 +51,7 @@ public class LookupDoc
}
System.err.println("Successfully looked up");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/RemoveDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/RemoveDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/RemoveDoc.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/RemoveDoc.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class RemoveDoc
}
System.err.println("Successfully deleted");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/SetMetadataValue.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/SetMetadataValue.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/SetMetadataValue.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/SetMetadataValue.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class SetMetadataValue
}
System.err.println("Successfully set metadata");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/VersionDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/VersionDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/VersionDoc.java (original)
+++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/manifoldcf/crawler/connectors/livelink/VersionDoc.java Mon Oct 4 14:32:19 2010
@@ -51,7 +51,7 @@ public class VersionDoc
}
System.err.println("Successfully revised");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/AddRecord.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/AddRecord.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/AddRecord.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/AddRecord.java Mon Oct 4 14:32:19 2010
@@ -53,7 +53,7 @@ public class AddRecord
}
System.err.println("Successfully added");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/LookupRecord.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/LookupRecord.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/LookupRecord.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/LookupRecord.java Mon Oct 4 14:32:19 2010
@@ -53,7 +53,7 @@ public class LookupRecord
}
System.err.println("Successfully located");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/MemexSupport.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/MemexSupport.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/MemexSupport.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/MemexSupport.java Mon Oct 4 14:32:19 2010
@@ -45,9 +45,9 @@ public class MemexSupport
public static final String _rcsid = "@(#)$Id: MemexSupport.java 988245 2010-08-23 18:39:35Z kwright $";
//mieConnection is the connection to the main Configuration Server.
- //There will be further ACFMemexConnection objects for each
+ //There will be further ManifoldCFMemexConnection objects for each
//physical server accessed through the physicalServers collection.
- private ACFMemexConnection mieConnection = null;
+ private ManifoldCFMemexConnection mieConnection = null;
private MemexConnectionPool miePool = new MemexConnectionPool();
//Collection describing the logical servers making up this system
@@ -55,7 +55,7 @@ public class MemexSupport
private Hashtable<String, LogicalServer> logicalServersByPrefix = null;
//Collection describing the physical servers making up this system
- private Hashtable<String, ACFMemexConnection> physicalServers = null;
+ private Hashtable<String, ManifoldCFMemexConnection> physicalServers = null;
//Two collections describing the entities in the set-up - one keyed by the entities' name, the other
//by their label - generally speaking, we should use labels for anything being presented to the users
@@ -77,7 +77,7 @@ public class MemexSupport
/** Constructor. Self-explanatory.
*/
public MemexSupport(String memexUserID, String memexPassword, String memexServerName, String memexServerPort)
- throws ACFException
+ throws ManifoldCFException
{
miePool.setUsername(memexUserID);
miePool.setPassword(memexPassword);
@@ -92,24 +92,24 @@ public class MemexSupport
*@return a string identifier that can be used to identify the record uniquely
*/
public String addRecord(Hashtable keyValuePairs, String server, String database)
- throws ACFException
+ throws ManifoldCFException
{
try{
this.setupConnection();
}catch(Exception e){
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
//Check the logical server exists
LogicalServer ls = logicalServers.get(server);
if(ls == null){
- throw new ACFException("Memex Error adding a record - logical server " + server + " cannot be found");
+ throw new ManifoldCFException("Memex Error adding a record - logical server " + server + " cannot be found");
}
//Check the entity exists
MemexEntity ent = entitiesByPrefix.get(database);
if(ent == null){
- throw new ACFException("Memex Error adding a record - entity " + database + " cannot be found");
+ throw new ManifoldCFException("Memex Error adding a record - entity " + database + " cannot be found");
}
//Check there is a database of the selected entity type on the selected server
@@ -123,7 +123,7 @@ public class MemexSupport
}
}
if(found == false){
- throw new ACFException("Memex Error adding a record - entity " + database + " not found on server " + server);
+ throw new ManifoldCFException("Memex Error adding a record - entity " + database + " not found on server " + server);
}
//Build up the minimum fields for a Memex record
@@ -136,10 +136,10 @@ public class MemexSupport
sysurn = prefix + "0" + sysurn.substring(4);
}
}catch(MemexException e){
- throw new ACFException("Memex Error adding record - " + e.getMessage(),e);
+ throw new ManifoldCFException("Memex Error adding record - " + e.getMessage(),e);
}
if(sysurn.equals("")){
- throw new ACFException("Memex Error adding record - failed to get a urn");
+ throw new ManifoldCFException("Memex Error adding record - failed to get a urn");
}
long epochtime = System.currentTimeMillis();
@@ -236,7 +236,7 @@ public class MemexSupport
auditRecord += "xxcreatetime\n" + systimecreated +"\n";
auditRecord += "xxcreatedby\n" + miePool.getUsername() +"\n";
auditRecord += "xxsessionid\n";
- auditRecord += "xxfullname\nACF Support Program\n";
+ auditRecord += "xxfullname\nManifoldCF Support Program\n";
auditRecord += "xxusername\n" + miePool.getUsername() +"\n";
auditRecord += "xxclienthost\n" + InetAddress.getLocalHost().getHostName() +"\n";
@@ -253,7 +253,7 @@ public class MemexSupport
cs.getMIE().mie.mxie_svrfile_remove(appendFile);
}catch(Exception e){
- throw new ACFException("Memex Error adding record : " + e.getMessage(),e);
+ throw new ManifoldCFException("Memex Error adding record : " + e.getMessage(),e);
}
return sysurn;
@@ -265,24 +265,24 @@ public class MemexSupport
*@param keyValuePairs is the set of fieldname/value pairs to change
*/
public void modifyRecord(String id, Hashtable keyValuePairs)
- throws ACFException
+ throws ManifoldCFException
{
try{
this.setupConnection();
}catch(Exception e){
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
//Check the logical server exists
LogicalServer ls = logicalServersByPrefix.get(id.substring(0, 2));
if(ls == null){
- throw new ACFException("Memex Error modifying a record - logical server cannot be found");
+ throw new ManifoldCFException("Memex Error modifying a record - logical server cannot be found");
}
//Check the entity exists
MemexEntity ent = entitiesByPrefix.get(id.substring(2, 4));
if(ent == null){
- throw new ACFException("Memex Error modifying a record - entity cannot be found");
+ throw new ManifoldCFException("Memex Error modifying a record - entity cannot be found");
}
//Check there is a database of the selected entity type on the selected server
@@ -296,7 +296,7 @@ public class MemexSupport
}
}
if(found == false){
- throw new ACFException("Memex Error modifying a record - entity not found on server ");
+ throw new ManifoldCFException("Memex Error modifying a record - entity not found on server ");
}
//OK - do the search
@@ -345,7 +345,7 @@ public class MemexSupport
String sysurn = (String)mxRecord.get("sysurn");
if((sysurn == null)||(!(sysurn.equals(id)))){
//something's gone way wrong
- throw new ACFException("Memex Error : returned record does not match provided ID when updating record");
+ throw new ManifoldCFException("Memex Error : returned record does not match provided ID when updating record");
}else{
mxRecord.remove("sysurn");
sysurn += "\n";
@@ -484,7 +484,7 @@ public class MemexSupport
auditRecord += "xxreviewdate\n\n";
auditRecord += "xxcreatedby\n" + miePool.getUsername() +"\n";
auditRecord += "xxsessionid\n";
- auditRecord += "xxfullname\nACF Support Program\n";
+ auditRecord += "xxfullname\nManifoldCF Support Program\n";
auditRecord += "xxusername\n" + miePool.getUsername() +"\n";
auditRecord += "xxclienthost\n" + InetAddress.getLocalHost().getHostName() +"\n";
@@ -502,7 +502,7 @@ public class MemexSupport
}
}catch(Exception e){
- throw new ACFException("Memex Error searching for record to modify : " + e.getMessage(),e);
+ throw new ManifoldCFException("Memex Error searching for record to modify : " + e.getMessage(),e);
}
@@ -514,7 +514,7 @@ public class MemexSupport
*@param id is a string identifier which uniquely identifies the record to remove
*/
public void removeRecord(String id)
- throws ACFException
+ throws ManifoldCFException
{
try{
this.setupConnection();
@@ -522,13 +522,13 @@ public class MemexSupport
//Check the logical server exists
LogicalServer ls = logicalServersByPrefix.get(id.substring(0, 2));
if(ls == null){
- throw new ACFException("Memex Error deleting a record - logical server cannot be found");
+ throw new ManifoldCFException("Memex Error deleting a record - logical server cannot be found");
}
//Check the entity exists
MemexEntity ent = entitiesByPrefix.get(id.substring(2, 4));
if(ent == null){
- throw new ACFException("Memex Error deleting a record - entity cannot be found");
+ throw new ManifoldCFException("Memex Error deleting a record - entity cannot be found");
}
//Check there is a database of the selected entity type on the selected server
@@ -542,7 +542,7 @@ public class MemexSupport
}
}
if(found == false){
- throw new ACFException("Memex Error deleting a record - entity not found on server ");
+ throw new ManifoldCFException("Memex Error deleting a record - entity not found on server ");
}
@@ -563,7 +563,7 @@ public class MemexSupport
auditRecord += "xxcreatetime\n" + timedeleted +"\n";
auditRecord += "xxcreatedby\n" + miePool.getUsername() +"\n";
auditRecord += "xxsessionid\n";
- auditRecord += "xxfullname\nACF Support Program\n";
+ auditRecord += "xxfullname\nManifoldCF Support Program\n";
auditRecord += "xxusername\n" + miePool.getUsername() +"\n";
auditRecord += "xxclienthost\n" + InetAddress.getLocalHost().getHostName() +"\n";
@@ -581,7 +581,7 @@ public class MemexSupport
}catch(Exception e){
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
}
@@ -595,7 +595,7 @@ public class MemexSupport
*@return the id of the first record that matches, or null if none found
*/
public String lookupRecord(String virtualServer, String entityName, String fieldName, String fieldValue)
- throws ACFException
+ throws ManifoldCFException
{
try{
@@ -604,13 +604,13 @@ public class MemexSupport
//Check the logical server exists
LogicalServer ls = logicalServers.get(virtualServer);
if(ls == null){
- throw new ACFException("Memex Error looking up a record - logical server cannot be found");
+ throw new ManifoldCFException("Memex Error looking up a record - logical server cannot be found");
}
//Check the entity exists
MemexEntity ent = entitiesByPrefix.get(entityName);
if(ent == null){
- throw new ACFException("Memex Error looking up a record - entity cannot be found");
+ throw new ManifoldCFException("Memex Error looking up a record - entity cannot be found");
}
//Check the entity contains the field we're looking for
@@ -622,7 +622,7 @@ public class MemexSupport
}
}
if(!found){
- throw new ACFException("Memex Error looking up a record - entity does not contain field");
+ throw new ManifoldCFException("Memex Error looking up a record - entity does not contain field");
}
//Check there is a database of the selected entity type on the selected server
@@ -636,7 +636,7 @@ public class MemexSupport
}
}
if(found == false){
- throw new ACFException("Memex Error looking up a record - entity not found on server ");
+ throw new ManifoldCFException("Memex Error looking up a record - entity not found on server ");
}
//strip off the subrecord name
@@ -653,7 +653,7 @@ public class MemexSupport
return sysurn.getText();
}
}catch(Exception e){
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
return null;
}
@@ -666,7 +666,7 @@ public class MemexSupport
*@param userGroupSet is the set of security group identifiers that have read access (?)
*/
public void setRecordSecurity(String id, String[] userGroupSet)
- throws ACFException
+ throws ManifoldCFException
{
try{
@@ -677,7 +677,7 @@ public class MemexSupport
for(int i = 0; i < userGroupSet.length; i++){
String lock = getSecurityLock(userGroupSet[i]);
if (lock == null)
- throw new ACFException("Invalid user/group name: '"+userGroupSet[i]+"'");
+ throw new ManifoldCFException("Invalid user/group name: '"+userGroupSet[i]+"'");
if(i > 0){
clocks += ", " + lock;
}else{
@@ -691,11 +691,11 @@ public class MemexSupport
this.modifyRecord(id, newValues);
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
throw e;
}catch(Exception e){
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
}
@@ -710,7 +710,7 @@ public class MemexSupport
*@param protectedmessage is the nessage isplayed to users who do not have access to the record.
*/
public void setRecordSecurity(String id, String[] userGroupSet, String protectedmessage)
- throws ACFException
+ throws ManifoldCFException
{
try{
this.setupConnection();
@@ -720,7 +720,7 @@ public class MemexSupport
for(int i = 0; i < userGroupSet.length; i++){
String lock = getSecurityLock(userGroupSet[i]);
if (lock == null)
- throw new ACFException("Invalid user/group name: '"+userGroupSet[i]+"'");
+ throw new ManifoldCFException("Invalid user/group name: '"+userGroupSet[i]+"'");
if(i > 0){
plocks += ", " + lock;
}else{
@@ -738,12 +738,12 @@ public class MemexSupport
this.modifyRecord(id, newValues);
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
throw e;
}
catch(Exception e){
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
}
@@ -751,7 +751,7 @@ public class MemexSupport
/** Close the connection. Call this before discarding the repository connector.
*/
public void close()
- throws ACFException
+ throws ManifoldCFException
{
this.cleanUpConnections();
}
@@ -762,7 +762,7 @@ public class MemexSupport
/*********************************************************************************/
private void setupConnection()
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
boolean connected = false;
if((this.physicalServers != null) && !(this.physicalServers.isEmpty())){
@@ -770,7 +770,7 @@ public class MemexSupport
connected = true;
for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
String serverkey = (String)serverkeys.nextElement();
- ACFMemexConnection pserver = physicalServers.get(serverkey);
+ ManifoldCFMemexConnection pserver = physicalServers.get(serverkey);
if(!(pserver.isConnected())){
connected = false;
}
@@ -784,10 +784,10 @@ public class MemexSupport
if(!connected){
try{
//Initialise data structures
- mieConnection = new ACFMemexConnection();
+ mieConnection = new ManifoldCFMemexConnection();
logicalServers = new Hashtable<String, LogicalServer>();
logicalServersByPrefix = new Hashtable<String, LogicalServer>();
- physicalServers = new Hashtable<String, ACFMemexConnection>();
+ physicalServers = new Hashtable<String, ManifoldCFMemexConnection>();
entitiesByName = new Hashtable<String, MemexEntity>();
entitiesByLabel = new Hashtable<String, MemexEntity>();
entitiesByPrefix = new Hashtable<String, MemexEntity>();
@@ -807,7 +807,7 @@ public class MemexSupport
mieConnection.ConnectionMessage = "Connection to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " created";
//Initialise the Query History
- //mieConnection.mie.mxie_history_open("ACFSupport", 1000);
+ //mieConnection.mie.mxie_history_open("ManifoldCFSupport", 1000);
//Create a collection of data structures describing the entities in this set-up
@@ -819,7 +819,7 @@ public class MemexSupport
}
catch(PoolAuthenticationException e){
- throw new ACFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()),e);
+ throw new ManifoldCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()),e);
}
catch(PoolException e){
//Logging.connectors.warn("Memex: Pool error connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " - " + e.getMessage() + " - retrying: " + e.getMessage(),e);
@@ -853,7 +853,7 @@ public class MemexSupport
while (i < serverKeyArray.length)
{
String serverkey = serverKeyArray[i++];
- ACFMemexConnection currentMIE = physicalServers.get(serverkey);
+ ManifoldCFMemexConnection currentMIE = physicalServers.get(serverkey);
try{
// Remove history directories belonging to this session
physicalServers.remove(serverkey);
@@ -884,7 +884,7 @@ public class MemexSupport
/**Creates an alphabetically ordered list of entity objects.
*/
private void getEntities()
- throws MemexException, ACFException
+ throws MemexException, ManifoldCFException
{
String mxEntityPath = null;
String[] entityReturn = new String[1];
@@ -955,12 +955,12 @@ public class MemexSupport
// Parse it!
entityForm = db.parse(formStream);
}catch(ParserConfigurationException e){
- throw new ACFException("Can't find a valid parser: "+e.getMessage(),e);
+ throw new ManifoldCFException("Can't find a valid parser: "+e.getMessage(),e);
}catch(SAXException e){
- throw new ACFException("XML had parse errors: "+e.getMessage(),e);
+ throw new ManifoldCFException("XML had parse errors: "+e.getMessage(),e);
}catch(IOException e){
// I/O problem
- throw new ACFException(e.getMessage(),e);
+ throw new ManifoldCFException(e.getMessage(),e);
}
finally
{
@@ -970,7 +970,7 @@ public class MemexSupport
}
catch (IOException e)
{
- throw new ACFException("Error reading memex form data: "+e.getMessage(),e);
+ throw new ManifoldCFException("Error reading memex form data: "+e.getMessage(),e);
}
}
}catch(MemexException e){
@@ -1104,7 +1104,7 @@ public class MemexSupport
serverFields.add(serversource);
//mieConnection.mie.mxie_goto_record(hist, x);
mieConnection.mie.mxie_decode_fields(serverFields);
- ACFMemexConnection mie;
+ ManifoldCFMemexConnection mie;
if(serversource.getText().equals("configuration-server")){
mie = mieConnection;
}else{
@@ -1120,21 +1120,21 @@ public class MemexSupport
logicalServers.put(ls.getServerName(), ls);
logicalServersByPrefix.put(ls.getPrefix(), ls);
//Initialise the Query History
- //ls.getMIE().mie.mxie_history_open("ACFSupport", 1000);
+ //ls.getMIE().mie.mxie_history_open("ManifoldCFSupport", 1000);
}
}
}
}
}
- private ACFMemexConnection getPhysicalServer(String server, int port){
+ private ManifoldCFMemexConnection getPhysicalServer(String server, int port){
String key = server + ":" + Integer.toString(port);
if(physicalServers.containsKey(key)){
- return (ACFMemexConnection)physicalServers.get(key);
+ return (ManifoldCFMemexConnection)physicalServers.get(key);
}else{
- ACFMemexConnection newServer = new ACFMemexConnection();
+ ManifoldCFMemexConnection newServer = new ManifoldCFMemexConnection();
try{
MemexConnection newMIE = miePool.getConnection(server, port);
newServer.mie = newMIE;
@@ -1243,7 +1243,7 @@ public class MemexSupport
* @return - the hash table representation of the record. Null if its not found
*/
private Hashtable getmxRecordObj(LogicalServer ls, int histno, int recnum)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
Hashtable mxRecord = null;
try{
Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/ModifyRecord.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/ModifyRecord.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/ModifyRecord.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/ModifyRecord.java Mon Oct 4 14:32:19 2010
@@ -52,7 +52,7 @@ public class ModifyRecord
}
System.err.println("Successfully modified");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/RemoveRecord.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/RemoveRecord.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/RemoveRecord.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/RemoveRecord.java Mon Oct 4 14:32:19 2010
@@ -51,7 +51,7 @@ public class RemoveRecord
}
System.err.println("Successfully removed");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/SetRecordSecurity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/SetRecordSecurity.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/SetRecordSecurity.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/manifoldcf/crawler/connectors/memex/SetRecordSecurity.java Mon Oct 4 14:32:19 2010
@@ -62,7 +62,7 @@ public class SetRecordSecurity
}
System.err.println("Successfully set security");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddDocMultiple.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddDocMultiple.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddDocMultiple.java (original)
+++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddDocMultiple.java Mon Oct 4 14:32:19 2010
@@ -44,7 +44,7 @@ public class AddDocMultiple
if (args.length < 9 || args.length > 10)
{
System.err.println("Usage: AddDocMultiple <docurl> <recurl> <username> <password> <folder> <filebasepath> <titlebasename> <levels> <docsperlevel> [<category>]");
- System.err.println(" E.g.: AddDocMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 ACFSearchable");
+ System.err.println(" E.g.: AddDocMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 ManifoldCFSearchable");
System.exit(1);
}
Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddRecMultiple.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddRecMultiple.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddRecMultiple.java (original)
+++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/AddRecMultiple.java Mon Oct 4 14:32:19 2010
@@ -44,7 +44,7 @@ public class AddRecMultiple
if (args.length < 9 || args.length > 10)
{
System.err.println("Usage: AddRecMultiple <docurl> <recurl> <username> <password> <folder> <filebasepath> <titlebasename> <levels> <docsperlevel> [<category>]");
- System.err.println(" E.g.: AddRecMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 ACFSearchable");
+ System.err.println(" E.g.: AddRecMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 ManifoldCFSearchable");
System.exit(1);
}
Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java (original)
+++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java Mon Oct 4 14:32:19 2010
@@ -91,7 +91,7 @@ public class MeridioTestWrapper extends
throws RemoteException, MalformedURLException, UnknownHostException
{
super(null,new URL(meridioDmwsUrlString),new URL(meridioRmwsUrlString),null,null,null,null,null,null,null,userName,password,
- InetAddress.getLocalHost().getHostName(),new ProtocolFactory(),ACF.getProperty("org.apache.manifoldcf.meridio.wsddpath"));
+ InetAddress.getLocalHost().getHostName(),new ProtocolFactory(),ManifoldCF.getProperty("org.apache.manifoldcf.meridio.wsddpath"));
this.meridioDmwsUrl = new URL(meridioDmwsUrlString);
this.meridioRmwsUrl = new URL(meridioRmwsUrlString);
this.userName = userName;
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddDoc.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddDoc.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class AddDoc
}
System.err.println("Successfully added");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToLibrary.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToLibrary.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToLibrary.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToLibrary.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class AddUserToLibrary
}
System.err.println("Successfully added user");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToSite.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToSite.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToSite.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/AddUserToSite.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class AddUserToSite
}
System.err.println("Successfully added user to site");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/FPSEPublish.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/FPSEPublish.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/FPSEPublish.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/FPSEPublish.java Mon Oct 4 14:32:19 2010
@@ -67,7 +67,7 @@ public class FPSEPublish
public FPSEPublish(String serverProtocol, String serverName, int serverPort, String serverLocation,
String userName, String password, String domainName)
- throws ACFException
+ throws ManifoldCFException
{
this.serverProtocol = serverProtocol;
this.serverName = serverName;
@@ -78,14 +78,14 @@ public class FPSEPublish
this.userName = userName;
this.passWord = password;
this.domainName = domainName;
- String fileName = ACF.getProperty("org.apache.manifoldcf.sharepoint.wsddpath");
+ String fileName = ManifoldCF.getProperty("org.apache.manifoldcf.sharepoint.wsddpath");
if (fileName == null)
- throw new ACFException("Missing org.apache.manifoldcf.sharepoint.wsddpath property!",ACFException.SETUP_ERROR);
+ throw new ManifoldCFException("Missing org.apache.manifoldcf.sharepoint.wsddpath property!",ManifoldCFException.SETUP_ERROR);
this.configuration = new FileProvider(fileName);
}
public void close()
- throws ACFException
+ throws ManifoldCFException
{
}
@@ -106,7 +106,7 @@ public class FPSEPublish
}
protected void UrlToWebUrl(String uri)
- throws ACFException
+ throws ManifoldCFException
{
String actualURL = getBaseUrl() + "/" + uri;
try
@@ -120,20 +120,20 @@ public class FPSEPublish
webUrl = GetReturnValue(response, "webUrl").replaceAll(" ","%20");
if (webUrl == null)
- throw new ACFException("Null web url for document described by '"+uri+"'");
+ throw new ManifoldCFException("Null web url for document described by '"+uri+"'");
fileUrl = GetReturnValue(response, "fileUrl");
if (fileUrl == null)
- throw new ACFException("Null file url for document described by '"+uri+"'");
+ throw new ManifoldCFException("Null file url for document described by '"+uri+"'");
// System.out.println("File url = "+fileUrl);
}
catch (MalformedURLException e)
{
- throw new ACFException("Malformed URL: '"+actualURL+"'",e);
+ throw new ManifoldCFException("Malformed URL: '"+actualURL+"'",e);
}
}
public void removeDocument(String url)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -155,16 +155,16 @@ public class FPSEPublish
}
catch (UnsupportedEncodingException e)
{
- throw new ACFException("Unsupported encoding",e);
+ throw new ManifoldCFException("Unsupported encoding",e);
}
catch (IOException e)
{
- throw new ACFException("IO exception",e);
+ throw new ManifoldCFException("IO exception",e);
}
}
public void writeDocument(String url, String fileName, String metaInfo)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -218,20 +218,20 @@ public class FPSEPublish
}
catch (FileNotFoundException e)
{
- throw new ACFException("File not found",e);
+ throw new ManifoldCFException("File not found",e);
}
catch (UnsupportedEncodingException e)
{
- throw new ACFException("Unsupported encoding",e);
+ throw new ManifoldCFException("Unsupported encoding",e);
}
catch (IOException e)
{
- throw new ACFException("IO exception",e);
+ throw new ManifoldCFException("IO exception",e);
}
}
public void checkinDocument(String uri)
- throws ACFException
+ throws ManifoldCFException
{
UrlToWebUrl(uri);
@@ -244,13 +244,13 @@ public class FPSEPublish
}
catch (UnsupportedEncodingException e)
{
- throw new ACFException("Unsupported encoding",e);
+ throw new ManifoldCFException("Unsupported encoding",e);
}
}
public void addUser( String siteUrl, String lib, String user)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -261,16 +261,16 @@ public class FPSEPublish
}
catch (org.apache.axis.AxisFault e)
{
- throw new ACFException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
+ throw new ManifoldCFException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
}
catch (Exception e)
{
- throw new ACFException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'",e);
+ throw new ManifoldCFException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'",e);
}
}
public void delUser( String siteUrl, String lib, String user)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -281,16 +281,16 @@ public class FPSEPublish
}
catch (org.apache.axis.AxisFault e)
{
- throw new ACFException("Error removing user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
+ throw new ManifoldCFException("Error removing user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
}
catch (Exception e)
{
- throw new ACFException("Error removing user '"+user+"' from '"+siteUrl+"' library '"+lib+"'",e);
+ throw new ManifoldCFException("Error removing user '"+user+"' from '"+siteUrl+"' library '"+lib+"'",e);
}
}
public void addSiteUser( String siteUrl, String alias, String displayName, String email, String group)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -309,18 +309,18 @@ public class FPSEPublish
}
catch (org.apache.axis.AxisFault e)
{
- throw new ACFException("Error adding site user '"+alias+"' to site '"+siteUrl+"' in group '" + group + "'; axis fault: "+e.dumpToString(),e);
+ throw new ManifoldCFException("Error adding site user '"+alias+"' to site '"+siteUrl+"' in group '" + group + "'; axis fault: "+e.dumpToString(),e);
}
}
}
catch (Exception e)
{
- throw new ACFException("Error adding site user '"+alias+"' to '"+siteUrl,e);
+ throw new ManifoldCFException("Error adding site user '"+alias+"' to '"+siteUrl,e);
}
}
public void delSiteUser( String siteUrl, String alias )
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -331,17 +331,17 @@ public class FPSEPublish
}
catch (org.apache.axis.AxisFault e)
{
- throw new ACFException("Error removing site user '"+alias+"' from '"+siteUrl+"'; axis fault: "+e.dumpToString(),e);
+ throw new ManifoldCFException("Error removing site user '"+alias+"' from '"+siteUrl+"'; axis fault: "+e.dumpToString(),e);
}
catch (Exception e)
{
- throw new ACFException("Error removing site user '"+alias+"' from '"+siteUrl+"'",e);
+ throw new ManifoldCFException("Error removing site user '"+alias+"' from '"+siteUrl+"'",e);
}
}
public void setDocsMetaInfo(String uri, String metaInfo)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -354,12 +354,12 @@ public class FPSEPublish
}
catch (UnsupportedEncodingException e)
{
- throw new ACFException("Unsupported encoding",e);
+ throw new ManifoldCFException("Unsupported encoding",e);
}
}
private String SendRequest(String uri, String postBody)
- throws ACFException
+ throws ManifoldCFException
{
try
@@ -383,7 +383,7 @@ public class FPSEPublish
}
catch (Exception e)
{
- throw new ACFException("Error sending request to '"+uri+"'",e);
+ throw new ManifoldCFException("Error sending request to '"+uri+"'",e);
}
}
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveDoc.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveDoc.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveDoc.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class RemoveDoc
}
System.err.println("Successfully deleted");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class RemoveUserFromLibrary
}
System.err.println("Successfully removed user");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);
Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromSite.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromSite.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromSite.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/manifoldcf/crawler/connectors/sharepoint/RemoveUserFromSite.java Mon Oct 4 14:32:19 2010
@@ -50,7 +50,7 @@ public class RemoveUserFromSite
}
System.err.println("Successfully removed site user");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace(System.err);
System.exit(2);