Return-Path: Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: (qmail 55529 invoked from network); 23 Aug 2010 18:10:59 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Aug 2010 18:10:59 -0000 Received: (qmail 83545 invoked by uid 500); 23 Aug 2010 18:10:59 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 83509 invoked by uid 500); 23 Aug 2010 18:10:59 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 83502 invoked by uid 99); 23 Aug 2010 18:10:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Aug 2010 18:10:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED,WEIRD_QUOTING X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Aug 2010 18:10:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 91B772388C64; Mon, 23 Aug 2010 18:08:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r988237 [23/24] - in /incubator/lcf/trunk: modules/connectors/activedirectory/connector/org/apache/acf/authorities/authorities/activedirectory/ modules/connectors/documentum/connector/org/apache/acf/crawler/authorities/DCTM/ modules/connect... Date: Mon, 23 Aug 2010 18:08:42 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100823180909.91B772388C64@eris.apache.org> Modified: incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/TestBase.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/TestBase.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/TestBase.java (original) +++ incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/TestBase.java Mon Aug 23 18:08:32 2010 @@ -19,7 +19,7 @@ package org.apache.acf.core.tests; import org.apache.acf.core.interfaces.*; -import org.apache.acf.core.system.LCF; +import org.apache.acf.core.system.ACF; import java.io.*; import java.util.*; @@ -98,11 +98,11 @@ public class TestBase " \n" + "\n"); - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); // Create the database - LCF.createSystemDatabase(tc,"",""); + ACF.createSystemDatabase(tc,"",""); } @@ -127,11 +127,11 @@ public class TestBase initialize(); if (isInitialized()) { - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); // Remove the database - LCF.dropSystemDatabase(tc,"",""); + ACF.dropSystemDatabase(tc,"",""); // Get rid of the property and logging files. logOutputFile.delete(); Modified: incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/UILockSpinner.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/UILockSpinner.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/UILockSpinner.java (original) +++ incubator/lcf/trunk/modules/framework/tests/org/apache/acf/core/tests/UILockSpinner.java Mon Aug 23 18:08:32 2010 @@ -18,7 +18,7 @@ package org.apache.acf.core.tests; import org.apache.acf.core.interfaces.*; -import org.apache.acf.core.system.LCF; +import org.apache.acf.core.system.ACF; public class UILockSpinner { @@ -28,7 +28,7 @@ public class UILockSpinner public static void main(String[] argv) throws Exception { - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); // Create a thread context object. Modified: incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/Sanity.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/Sanity.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/Sanity.java (original) +++ incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/Sanity.java Mon Aug 23 18:08:32 2010 @@ -20,7 +20,7 @@ package org.apache.acf.crawler.tests; import org.apache.acf.core.interfaces.*; import org.apache.acf.agents.interfaces.*; -import org.apache.acf.agents.system.LCF; +import org.apache.acf.agents.system.ACF; import java.io.*; import java.util.*; Modified: incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestBase.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestBase.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestBase.java (original) +++ incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestBase.java Mon Aug 23 18:08:32 2010 @@ -21,7 +21,7 @@ package org.apache.acf.crawler.tests; import org.apache.acf.core.interfaces.*; import org.apache.acf.agents.interfaces.*; import org.apache.acf.crawler.interfaces.*; -import org.apache.acf.crawler.system.LCF; +import org.apache.acf.crawler.system.ACF; import java.io.*; import java.util.*; @@ -61,7 +61,7 @@ public class TestBase extends org.apache // Install the agents tables initialize(); - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); IAgentManager mgr = AgentManagerFactory.make(tc); mgr.registerAgent("org.apache.acf.crawler.system.CrawlerAgent"); @@ -89,7 +89,7 @@ public class TestBase extends org.apache if (isInitialized()) { // Test the uninstall - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); Exception currentException = null; Modified: incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestConnectorBase.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestConnectorBase.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestConnectorBase.java (original) +++ incubator/lcf/trunk/modules/framework/tests/org/apache/acf/crawler/tests/TestConnectorBase.java Mon Aug 23 18:08:32 2010 @@ -22,7 +22,7 @@ import org.apache.acf.core.interfaces.*; import org.apache.acf.agents.interfaces.*; import org.apache.acf.crawler.interfaces.*; import org.apache.acf.authorities.interfaces.*; -import org.apache.acf.core.system.LCF; +import org.apache.acf.core.system.ACF; import java.io.*; import java.util.*; @@ -93,13 +93,13 @@ public class TestConnectorBase extends o // Register the connector we're testing initialize(); - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); IDBInterface database = DBInterfaceFactory.make(tc, - LCF.getMasterDatabaseName(), - LCF.getMasterDatabaseUsername(), - LCF.getMasterDatabasePassword()); + ACF.getMasterDatabaseName(), + ACF.getMasterDatabaseUsername(), + ACF.getMasterDatabasePassword()); IConnectorManager mgr = ConnectorManagerFactory.make(tc); IAuthorityConnectorManager authMgr = AuthorityConnectorManagerFactory.make(tc); @@ -157,7 +157,7 @@ public class TestConnectorBase extends o } } - catch (LCFException e) + catch (ACFException e) { database.signalRollback(); throw e; @@ -195,7 +195,7 @@ public class TestConnectorBase extends o if (isInitialized()) { // Test the uninstall - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); Exception currentException = null; @@ -238,9 +238,9 @@ public class TestConnectorBase extends o try { IDBInterface database = DBInterfaceFactory.make(tc, - LCF.getMasterDatabaseName(), - LCF.getMasterDatabaseUsername(), - LCF.getMasterDatabasePassword()); + ACF.getMasterDatabaseName(), + ACF.getMasterDatabaseUsername(), + ACF.getMasterDatabasePassword()); IConnectorManager mgr = ConnectorManagerFactory.make(tc); IAuthorityConnectorManager authMgr = AuthorityConnectorManagerFactory.make(tc); @@ -293,7 +293,7 @@ public class TestConnectorBase extends o } } - catch (LCFException e) + catch (ACFException e) { database.signalRollback(); throw e; Modified: incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/beans/AdminProfile.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/beans/AdminProfile.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/beans/AdminProfile.java (original) +++ incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/beans/AdminProfile.java Mon Aug 23 18:08:32 2010 @@ -100,9 +100,9 @@ public class AdminProfile implements Htt if (userID != null) { IDBInterface database = DBInterfaceFactory.make(threadContext, - LCF.getMasterDatabaseName(), - LCF.getMasterDatabaseUsername(), - LCF.getMasterDatabasePassword()); + ACF.getMasterDatabaseName(), + ACF.getMasterDatabaseUsername(), + ACF.getMasterDatabasePassword()); // MHL to actually log in (when we figure out what to use as an authority) if (userID.equals("admin") && userPassword.equals("admin")) { @@ -112,7 +112,7 @@ public class AdminProfile implements Htt } } } - catch (LCFException e) + catch (ACFException e) { Logging.misc.fatal("Exception logging in!",e); } Modified: incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/multipart/MultipartWrapper.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/multipart/MultipartWrapper.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/multipart/MultipartWrapper.java (original) +++ incubator/lcf/trunk/modules/framework/ui-core/org/apache/acf/ui/multipart/MultipartWrapper.java Mon Aug 23 18:08:32 2010 @@ -42,7 +42,7 @@ public class MultipartWrapper implements /** Constructor. */ public MultipartWrapper(HttpServletRequest request) - throws LCFException + throws ACFException { // Check that we have a file upload request boolean isMultipart = FileUpload.isMultipartContent(request); @@ -82,14 +82,14 @@ public class MultipartWrapper implements else { if (((FileItem)list.get(0)).isFormField() != item.isFormField()) - throw new LCFException("Illegal form data; posted form has the same name for different data types ('"+name+"')!"); + throw new ACFException("Illegal form data; posted form has the same name for different data types ('"+name+"')!"); } list.add(item); } } catch (FileUploadException e) { - throw new LCFException("Problem uploading file: "+e.getMessage(),e); + throw new ACFException("Problem uploading file: "+e.getMessage(),e); } } @@ -168,7 +168,7 @@ public class MultipartWrapper implements /** Get a file parameter, as a binary input. */ public BinaryInput getBinaryStream(String name) - throws LCFException + throws ACFException { if (request != null) return null; @@ -199,7 +199,7 @@ public class MultipartWrapper implements } catch (IOException e) { - throw new LCFException("Error creating file binary stream",e); + throw new ACFException("Error creating file binary stream",e); } } Modified: incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/authorities/ResetAll.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/authorities/ResetAll.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/authorities/ResetAll.java (original) +++ incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/authorities/ResetAll.java Mon Aug 23 18:08:32 2010 @@ -44,7 +44,7 @@ public class ResetAll try { - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); IThreadContext tc = ThreadContextFactory.make(); // Now, get a list of the authority connections IAuthorityConnectionManager mgr = AuthorityConnectionManagerFactory.make(tc); Modified: incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/JobStartSpinner.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/JobStartSpinner.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/JobStartSpinner.java (original) +++ incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/JobStartSpinner.java Mon Aug 23 18:08:32 2010 @@ -48,7 +48,7 @@ public class JobStartSpinner try { - LCF.initializeEnvironment(); + ACF.initializeEnvironment(); // Create the import thread Thread importThread = new ImportThread(1000,importFilename); // Create the job start thread @@ -102,7 +102,7 @@ public class JobStartSpinner int i = 0; while (i < repeatCount) { - LCF.importConfiguration(tc,fileName); + ACF.importConfiguration(tc,fileName); if ((i % 100) == 0) System.out.println("Configuration import #"+Integer.toString(i)+" succeeded."); i++; Modified: incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/ResetAll.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/ResetAll.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/ResetAll.java (original) +++ incubator/lcf/trunk/tests/crawler-testing-package/org/apache/acf/crawler/ResetAll.java Mon Aug 23 18:08:32 2010 @@ -45,7 +45,7 @@ public class ResetAll try { - LCF.initializeEnvironment(); + ACF.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 (LCFException e) + catch (ACFException e) { // This generally means that the job was not running } @@ -85,7 +85,7 @@ public class ResetAll case JobStatus.JOBSTATUS_ERROR: break; default: - LCF.sleep(10000); + ACF.sleep(10000); continue; } } @@ -102,7 +102,7 @@ public class ResetAll { jobManager.deleteJob(desc.getID()); } - catch (LCFException e) + catch (ACFException 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) { - LCF.sleep(10000); + ACF.sleep(10000); continue; } break; Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/AddDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/AddDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/AddDoc.java (original) +++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/AddDoc.java Mon Aug 23 18:08:32 2010 @@ -86,7 +86,7 @@ public class AddDoc e.printStackTrace(System.err); System.exit(2); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/LookupDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/LookupDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/LookupDoc.java (original) +++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/LookupDoc.java Mon Aug 23 18:08:32 2010 @@ -63,7 +63,7 @@ public class LookupDoc } System.err.println("Successfully looked up"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/RemoveDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/RemoveDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/RemoveDoc.java (original) +++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/RemoveDoc.java Mon Aug 23 18:08:32 2010 @@ -52,7 +52,7 @@ public class RemoveDoc System.err.println("Successfully removed"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/UpdateDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/UpdateDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/UpdateDoc.java (original) +++ incubator/lcf/trunk/tests/jdbc-testing-package/org/apache/acf/crawler/connectors/jdbc/UpdateDoc.java Mon Aug 23 18:08:32 2010 @@ -75,7 +75,7 @@ public class UpdateDoc e.printStackTrace(System.err); System.exit(2); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDoc.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDoc.java Mon Aug 23 18:08:32 2010 @@ -51,7 +51,7 @@ public class AddDoc } System.err.println("Successfully added"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDocRights.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDocRights.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDocRights.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/AddDocRights.java Mon Aug 23 18:08:32 2010 @@ -50,7 +50,7 @@ public class AddDocRights } System.err.println("Successfully added rights"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LiveLinkSupport.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LiveLinkSupport.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LiveLinkSupport.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LiveLinkSupport.java Mon Aug 23 18:08:32 2010 @@ -57,7 +57,7 @@ public class LiveLinkSupport /** Constructor. */ public LiveLinkSupport(String serverName, int serverPort, String serverUserName, String serverPassword) - throws LCFException + throws ACFException { llServer = new LLSERVER(serverName,serverPort,serverUserName,serverPassword); @@ -88,14 +88,14 @@ public class LiveLinkSupport } catch (Exception e) { - throw new LCFException("Connection failed: "+e.getMessage()+"; Details: "+llServer.getErrors(), e, LCFException.SETUP_ERROR); + throw new ACFException("Connection failed: "+e.getMessage()+"; Details: "+llServer.getErrors(), e, ACFException.SETUP_ERROR); } } /** Close the connection. Call this before discarding the repository connector. */ public void close() - throws LCFException + throws ACFException { llServer.disconnect(); llServer = null; @@ -106,7 +106,7 @@ public class LiveLinkSupport /** Look up a document. */ public String lookupDocument(String LLpathString) - throws LCFException + throws ACFException { 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 LCFException + throws ACFException { 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 LCFException("No such path: '"+LLpathString+"'"); + throw new ACFException("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 LCFException("Error adding document: "+llServer.getErrors()); + throw new ACFException("Error adding document: "+llServer.getErrors()); } return Integer.toString(objInfo.toInteger( "ID" )); @@ -152,7 +152,7 @@ public class LiveLinkSupport if ( status != 0 ) { - throw new LCFException("Error updating document: "+llServer.getErrors()); + throw new ACFException("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 LCFException + throws ACFException { VolumeAndId volID = findPath(LLpathString); if (volID == null) @@ -174,18 +174,18 @@ public class LiveLinkSupport if ( status != 0 ) { - throw new LCFException("Error deleting document: "+llServer.getErrors()); + throw new ACFException("Error deleting document: "+llServer.getErrors()); } } /** Modify a document. */ public String modifyDocument(String LLpathString, String filename) - throws LCFException + throws ACFException { VolumeAndId volID = findPath(LLpathString); if (volID == null) - throw new LCFException("No such path: '"+LLpathString+"'"); + throw new ACFException("No such path: '"+LLpathString+"'"); // Add document LLValue versionInfo = new LLValue().setAssocNotSet(); @@ -194,7 +194,7 @@ public class LiveLinkSupport if ( status != 0 ) { - throw new LCFException("Error updating document: "+llServer.getErrors()); + throw new ACFException("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 LCFException + throws ACFException { VolumeAndId volID = findPath(LLpathString); if (volID == null) - throw new LCFException("No such path: '"+LLpathString+"'"); + throw new ACFException("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 LCFException("No such category: '"+categoryPathString+"'"); + throw new ACFException("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 LCFException("Can't fetch category attributes for category "+Integer.toString(catObjectID)); + throw new ACFException("Can't fetch category attributes for category "+Integer.toString(catObjectID)); if (status != 0) { - throw new LCFException("Error retrieving category version: "+Integer.toString(status)+": "+llServer.getErrors()); + throw new ACFException("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 LCFException("Error setting attribute value: "+Integer.toString(status)+": "+llServer.getErrors()); + throw new ACFException("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 LCFException("Can't set attributes for object "+Integer.toString(volID.getPathId())+ + throw new ACFException("Can't set attributes for object "+Integer.toString(volID.getPathId())+ " category "+Integer.toString(catObjectID)); if (status != 0) { - throw new LCFException("Error setting category version: "+Integer.toString(status)+": "+llServer.getErrors()); + throw new ACFException("Error setting category version: "+Integer.toString(status)+": "+llServer.getErrors()); } } catch (com.opentext.api.LLIllegalOperationException e) { - throw new LCFException("Livelink: Unexpected illegal operation error: "+e.getMessage(),e); + throw new ACFException("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 LCFException("IO Exception: "+e.getMessage(),e); + throw new ACFException("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 LCFException + throws ACFException { VolumeAndId volID = findPath(LLpathString); if (volID == null) - throw new LCFException("No such path: '"+LLpathString+"'"); + throw new ACFException("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 LCFException("Error getting user info: "+llServer.getErrors()); + throw new ACFException("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 LCFException("Error setting permissions: "+llServer.getErrors()); + throw new ACFException("Error setting permissions: "+llServer.getErrors()); } } - catch (LCFException e) + catch (ACFException e) { throw e; } catch (Exception e) { - throw new LCFException("Exception looking up user '"+userName+"'",e); + throw new ACFException("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 LCFException + throws ACFException { RootValue rv = new RootValue(pathString); @@ -346,7 +346,7 @@ public class LiveLinkSupport /** Rootvalue version of getCategoryId. */ protected int getCategoryId(RootValue rv) - throws LCFException + throws ACFException { 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 LCFException + throws ACFException { // 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 LCFException("Error finding category children: "+Integer.toString(status)+": "+llServer.getErrors()); + throw new ACFException("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 LCFException("Error: no children!"); + throw new ACFException("Error: no children!"); } } catch (com.opentext.api.LLIllegalOperationException e) { - throw new LCFException("Livelink: Unexpected illegal operation error: "+e.getMessage(),e); + throw new ACFException("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 LCFException("IO exception: "+e.getMessage(),e); + throw new ACFException("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 LCFException + protected LLValue getObjectInfo(int vol, int id) throws ACFException { 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 LCFException("Error retrieving document object: "+llServer.getErrors()); + throw new ACFException("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 LCFException + throws ACFException { 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 LCFException + throws ACFException { // 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 LCFException("Error finding start node path: "+llServer.getErrors()); + throw new ACFException("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 LCFException + throws ACFException { 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 LCFException("Bad workspace name"); + throw new ACFException("Bad workspace name"); if (rootValue == null) - throw new LCFException("Could not get workspace/volume ID"); + throw new ACFException("Could not get workspace/volume ID"); } return rootValue; Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LookupDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LookupDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LookupDoc.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/LookupDoc.java Mon Aug 23 18:08:32 2010 @@ -51,7 +51,7 @@ public class LookupDoc } System.err.println("Successfully looked up"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/RemoveDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/RemoveDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/RemoveDoc.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/RemoveDoc.java Mon Aug 23 18:08:32 2010 @@ -50,7 +50,7 @@ public class RemoveDoc } System.err.println("Successfully deleted"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/SetMetadataValue.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/SetMetadataValue.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/SetMetadataValue.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/SetMetadataValue.java Mon Aug 23 18:08:32 2010 @@ -50,7 +50,7 @@ public class SetMetadataValue } System.err.println("Successfully set metadata"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/VersionDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/VersionDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/VersionDoc.java (original) +++ incubator/lcf/trunk/tests/livelink-testing-package/org/apache/acf/crawler/connectors/livelink/VersionDoc.java Mon Aug 23 18:08:32 2010 @@ -51,7 +51,7 @@ public class VersionDoc } System.err.println("Successfully revised"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/AddRecord.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/AddRecord.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/AddRecord.java (original) +++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/AddRecord.java Mon Aug 23 18:08:32 2010 @@ -53,7 +53,7 @@ public class AddRecord } System.err.println("Successfully added"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/LookupRecord.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/LookupRecord.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/LookupRecord.java (original) +++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/LookupRecord.java Mon Aug 23 18:08:32 2010 @@ -53,7 +53,7 @@ public class LookupRecord } System.err.println("Successfully located"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/MemexSupport.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/MemexSupport.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/MemexSupport.java (original) +++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/MemexSupport.java Mon Aug 23 18:08:32 2010 @@ -45,9 +45,9 @@ public class MemexSupport public static final String _rcsid = "@(#)$Id: MemexSupport.java 921329 2010-03-10 12:44:20Z kwright $"; //mieConnection is the connection to the main Configuration Server. - //There will be further LCFMemexConnection objects for each + //There will be further ACFMemexConnection objects for each //physical server accessed through the physicalServers collection. - private LCFMemexConnection mieConnection = null; + private ACFMemexConnection 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 logicalServersByPrefix = null; //Collection describing the physical servers making up this system - private Hashtable physicalServers = null; + private Hashtable 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 LCFException + throws ACFException { 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 LCFException + throws ACFException { try{ this.setupConnection(); }catch(Exception e){ - throw new LCFException(e.getMessage(),e); + throw new ACFException(e.getMessage(),e); } //Check the logical server exists LogicalServer ls = logicalServers.get(server); if(ls == null){ - throw new LCFException("Memex Error adding a record - logical server " + server + " cannot be found"); + throw new ACFException("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 LCFException("Memex Error adding a record - entity " + database + " cannot be found"); + throw new ACFException("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 LCFException("Memex Error adding a record - entity " + database + " not found on server " + server); + throw new ACFException("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 LCFException("Memex Error adding record - " + e.getMessage(),e); + throw new ACFException("Memex Error adding record - " + e.getMessage(),e); } if(sysurn.equals("")){ - throw new LCFException("Memex Error adding record - failed to get a urn"); + throw new ACFException("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\nLCF Support Program\n"; + auditRecord += "xxfullname\nACF 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 LCFException("Memex Error adding record : " + e.getMessage(),e); + throw new ACFException("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 LCFException + throws ACFException { try{ this.setupConnection(); }catch(Exception e){ - throw new LCFException(e.getMessage(),e); + throw new ACFException(e.getMessage(),e); } //Check the logical server exists LogicalServer ls = logicalServersByPrefix.get(id.substring(0, 2)); if(ls == null){ - throw new LCFException("Memex Error modifying a record - logical server cannot be found"); + throw new ACFException("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 LCFException("Memex Error modifying a record - entity cannot be found"); + throw new ACFException("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 LCFException("Memex Error modifying a record - entity not found on server "); + throw new ACFException("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 LCFException("Memex Error : returned record does not match provided ID when updating record"); + throw new ACFException("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\nLCF Support Program\n"; + auditRecord += "xxfullname\nACF 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 LCFException("Memex Error searching for record to modify : " + e.getMessage(),e); + throw new ACFException("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 LCFException + throws ACFException { 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 LCFException("Memex Error deleting a record - logical server cannot be found"); + throw new ACFException("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 LCFException("Memex Error deleting a record - entity cannot be found"); + throw new ACFException("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 LCFException("Memex Error deleting a record - entity not found on server "); + throw new ACFException("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\nLCF Support Program\n"; + auditRecord += "xxfullname\nACF 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 LCFException(e.getMessage(),e); + throw new ACFException(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 LCFException + throws ACFException { try{ @@ -604,13 +604,13 @@ public class MemexSupport //Check the logical server exists LogicalServer ls = logicalServers.get(virtualServer); if(ls == null){ - throw new LCFException("Memex Error looking up a record - logical server cannot be found"); + throw new ACFException("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 LCFException("Memex Error looking up a record - entity cannot be found"); + throw new ACFException("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 LCFException("Memex Error looking up a record - entity does not contain field"); + throw new ACFException("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 LCFException("Memex Error looking up a record - entity not found on server "); + throw new ACFException("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 LCFException(e.getMessage(),e); + throw new ACFException(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 LCFException + throws ACFException { 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 LCFException("Invalid user/group name: '"+userGroupSet[i]+"'"); + throw new ACFException("Invalid user/group name: '"+userGroupSet[i]+"'"); if(i > 0){ clocks += ", " + lock; }else{ @@ -691,11 +691,11 @@ public class MemexSupport this.modifyRecord(id, newValues); } } - catch (LCFException e) + catch (ACFException e) { throw e; }catch(Exception e){ - throw new LCFException(e.getMessage(),e); + throw new ACFException(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 LCFException + throws ACFException { 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 LCFException("Invalid user/group name: '"+userGroupSet[i]+"'"); + throw new ACFException("Invalid user/group name: '"+userGroupSet[i]+"'"); if(i > 0){ plocks += ", " + lock; }else{ @@ -738,12 +738,12 @@ public class MemexSupport this.modifyRecord(id, newValues); } } - catch (LCFException e) + catch (ACFException e) { throw e; } catch(Exception e){ - throw new LCFException(e.getMessage(),e); + throw new ACFException(e.getMessage(),e); } } @@ -751,7 +751,7 @@ public class MemexSupport /** Close the connection. Call this before discarding the repository connector. */ public void close() - throws LCFException + throws ACFException { this.cleanUpConnections(); } @@ -762,7 +762,7 @@ public class MemexSupport /*********************************************************************************/ private void setupConnection() - throws LCFException, ServiceInterruption + throws ACFException, 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(); - LCFMemexConnection pserver = physicalServers.get(serverkey); + ACFMemexConnection pserver = physicalServers.get(serverkey); if(!(pserver.isConnected())){ connected = false; } @@ -784,10 +784,10 @@ public class MemexSupport if(!connected){ try{ //Initialise data structures - mieConnection = new LCFMemexConnection(); + mieConnection = new ACFMemexConnection(); logicalServers = new Hashtable(); logicalServersByPrefix = new Hashtable(); - physicalServers = new Hashtable(); + physicalServers = new Hashtable(); entitiesByName = new Hashtable(); entitiesByLabel = new Hashtable(); entitiesByPrefix = new Hashtable(); @@ -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("LCFSupport", 1000); + //mieConnection.mie.mxie_history_open("ACFSupport", 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 LCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()),e); + throw new ACFException("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++]; - LCFMemexConnection currentMIE = physicalServers.get(serverkey); + ACFMemexConnection 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, LCFException + throws MemexException, ACFException { 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 LCFException("Can't find a valid parser: "+e.getMessage(),e); + throw new ACFException("Can't find a valid parser: "+e.getMessage(),e); }catch(SAXException e){ - throw new LCFException("XML had parse errors: "+e.getMessage(),e); + throw new ACFException("XML had parse errors: "+e.getMessage(),e); }catch(IOException e){ // I/O problem - throw new LCFException(e.getMessage(),e); + throw new ACFException(e.getMessage(),e); } finally { @@ -970,7 +970,7 @@ public class MemexSupport } catch (IOException e) { - throw new LCFException("Error reading memex form data: "+e.getMessage(),e); + throw new ACFException("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); - LCFMemexConnection mie; + ACFMemexConnection 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("LCFSupport", 1000); + //ls.getMIE().mie.mxie_history_open("ACFSupport", 1000); } } } } } - private LCFMemexConnection getPhysicalServer(String server, int port){ + private ACFMemexConnection getPhysicalServer(String server, int port){ String key = server + ":" + Integer.toString(port); if(physicalServers.containsKey(key)){ - return (LCFMemexConnection)physicalServers.get(key); + return (ACFMemexConnection)physicalServers.get(key); }else{ - LCFMemexConnection newServer = new LCFMemexConnection(); + ACFMemexConnection newServer = new ACFMemexConnection(); 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 LCFException, ServiceInterruption + throws ACFException, ServiceInterruption { Hashtable mxRecord = null; try{ Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/ModifyRecord.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/ModifyRecord.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/ModifyRecord.java (original) +++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/ModifyRecord.java Mon Aug 23 18:08:32 2010 @@ -52,7 +52,7 @@ public class ModifyRecord } System.err.println("Successfully modified"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/RemoveRecord.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/RemoveRecord.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/RemoveRecord.java (original) +++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/RemoveRecord.java Mon Aug 23 18:08:32 2010 @@ -51,7 +51,7 @@ public class RemoveRecord } System.err.println("Successfully removed"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/SetRecordSecurity.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/SetRecordSecurity.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/SetRecordSecurity.java (original) +++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/acf/crawler/connectors/memex/SetRecordSecurity.java Mon Aug 23 18:08:32 2010 @@ -62,7 +62,7 @@ public class SetRecordSecurity } System.err.println("Successfully set security"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddDocMultiple.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddDocMultiple.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddDocMultiple.java (original) +++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddDocMultiple.java Mon Aug 23 18:08:32 2010 @@ -44,7 +44,7 @@ public class AddDocMultiple if (args.length < 9 || args.length > 10) { System.err.println("Usage: AddDocMultiple []"); - System.err.println(" E.g.: AddDocMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 LCFSearchable"); + System.err.println(" E.g.: AddDocMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 ACFSearchable"); System.exit(1); } Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddRecMultiple.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddRecMultiple.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddRecMultiple.java (original) +++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/AddRecMultiple.java Mon Aug 23 18:08:32 2010 @@ -44,7 +44,7 @@ public class AddRecMultiple if (args.length < 9 || args.length > 10) { System.err.println("Usage: AddRecMultiple []"); - System.err.println(" E.g.: AddRecMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 LCFSearchable"); + System.err.println(" E.g.: AddRecMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 ACFSearchable"); System.exit(1); } Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java (original) +++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/acf/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java Mon Aug 23 18:08:32 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(),LCF.getProperty("org.apache.acf.meridio.wsddpath")); + InetAddress.getLocalHost().getHostName(),new ProtocolFactory(),ACF.getProperty("org.apache.acf.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/acf/crawler/connectors/sharepoint/AddDoc.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddDoc.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddDoc.java (original) +++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddDoc.java Mon Aug 23 18:08:32 2010 @@ -50,7 +50,7 @@ public class AddDoc } System.err.println("Successfully added"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToLibrary.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToLibrary.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToLibrary.java (original) +++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToLibrary.java Mon Aug 23 18:08:32 2010 @@ -50,7 +50,7 @@ public class AddUserToLibrary } System.err.println("Successfully added user"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2); Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToSite.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToSite.java?rev=988237&r1=988236&r2=988237&view=diff ============================================================================== --- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToSite.java (original) +++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/acf/crawler/connectors/sharepoint/AddUserToSite.java Mon Aug 23 18:08:32 2010 @@ -50,7 +50,7 @@ public class AddUserToSite } System.err.println("Successfully added user to site"); } - catch (LCFException e) + catch (ACFException e) { e.printStackTrace(System.err); System.exit(2);