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 [16/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/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorManagerFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorManagerFactory.java Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@ package org.apache.manifoldcf.authoritie
import org.apache.manifoldcf.core.interfaces.*;
import java.util.*;
-import org.apache.manifoldcf.authorities.system.ACF;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
/** This class is the factory for the Authority Connector Manager.
*/
@@ -37,16 +37,16 @@ public class AuthorityConnectorManagerFa
*@return the connector manager handle.
*/
public static IAuthorityConnectorManager make(IThreadContext tc)
- throws ACFException
+ throws ManifoldCFException
{
Object o = tc.get(connMgr);
if (o == null || !(o instanceof IAuthorityConnectorManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.authorities.authconnmgr.AuthorityConnectorManager(tc,database);
tc.save(connMgr,o);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java Mon Oct 4 14:32:19 2010
@@ -30,53 +30,53 @@ public interface IAuthorityConnectionMan
/** Install the manager.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall the manager.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Export configuration */
public void exportConfiguration(java.io.OutputStream os)
- throws java.io.IOException, ACFException;
+ throws java.io.IOException, ManifoldCFException;
/** Import configuration */
public void importConfiguration(java.io.InputStream is)
- throws java.io.IOException, ACFException;
+ throws java.io.IOException, ManifoldCFException;
/** Obtain a list of the authority connections, ordered by name.
*@return an array of connection objects.
*/
public IAuthorityConnection[] getAllConnections()
- throws ACFException;
+ throws ManifoldCFException;
/** Load a authority connection by name.
*@param name is the name of the authority connection.
*@return the loaded connection object, or null if not found.
*/
public IAuthorityConnection load(String name)
- throws ACFException;
+ throws ManifoldCFException;
/** Create a new authority connection object.
*@return the new object.
*/
public IAuthorityConnection create()
- throws ACFException;
+ throws ManifoldCFException;
/** Save an authority connection object.
*@param object is the object to save.
*@return true if the object was created, false otherwise.
*/
public boolean save(IAuthorityConnection object)
- throws ACFException;
+ throws ManifoldCFException;
/** Delete an authority connection.
*@param name is the name of the connection to delete. If the
* name does not exist, no error is returned.
*/
public void delete(String name)
- throws ACFException;
+ throws ManifoldCFException;
// Schema related
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnector.java Mon Oct 4 14:32:19 2010
@@ -38,7 +38,7 @@ public interface IAuthorityConnector ext
* (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
*/
public AuthorizationResponse getAuthorizationResponse(String userName)
- throws ACFException;
+ throws ManifoldCFException;
/** Obtain the default access tokens for a given user name.
*@param userName is the user name or identifier.
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectorManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectorManager.java Mon Oct 4 14:32:19 2010
@@ -28,12 +28,12 @@ public interface IAuthorityConnectorMana
/** Install.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Register a new connector.
* The connector's install method will also be called.
@@ -41,41 +41,41 @@ public interface IAuthorityConnectorMana
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Unregister a connector.
* The connector's deinstall method will also be called.
*@param className is the connector class to unregister.
*/
public void unregisterConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Remove a connector.
* Call this when the connector cannot be instantiated.
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Get ordered list of connectors.
*@return a resultset with the columns "description" and "classname".
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws ACFException;
+ throws ManifoldCFException;
/** Get a description given a class name.
*@param className is the class name.
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Check if a particular connector is installed or not.
*@param className is the class name of the connector.
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java Mon Oct 4 14:32:19 2010
@@ -38,7 +38,7 @@ public class AuthCheckThread extends Thr
/** Constructor.
*/
public AuthCheckThread(String id, RequestQueue requestQueue)
- throws ACFException
+ throws ManifoldCFException
{
super();
this.requestQueue = requestQueue;
@@ -58,7 +58,7 @@ public class AuthCheckThread extends Thr
try
{
if (Thread.currentThread().isInterrupted())
- throw new ACFException("Interrupted",ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
// Wait for a request.
AuthRequest theRequest = requestQueue.getRequest();
@@ -83,7 +83,7 @@ public class AuthCheckThread extends Thr
try
{
if (connector == null)
- exception = new ACFException("Authority connector "+theRequest.getClassName()+" is not registered.");
+ exception = new ManifoldCFException("Authority connector "+theRequest.getClassName()+" is not registered.");
else
{
// Get the acl for the user
@@ -91,9 +91,9 @@ public class AuthCheckThread extends Thr
{
response = connector.getAuthorizationResponse(theRequest.getUserID());
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
- if (e.getErrorCode() == ACFException.INTERRUPTED)
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
throw e;
Logging.authorityService.warn("Authority error: "+e.getMessage(),e);
response = AuthorityConnectorFactory.getDefaultAuthorizationResponse(threadContext,theRequest.getClassName(),theRequest.getUserID());
@@ -106,9 +106,9 @@ public class AuthCheckThread extends Thr
AuthorityConnectorFactory.release(connector);
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
- if (e.getErrorCode() == ACFException.INTERRUPTED)
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
throw e;
Logging.authorityService.warn("Authority connection exception: "+e.getMessage(),e);
response = AuthorityConnectorFactory.getDefaultAuthorizationResponse(threadContext,theRequest.getClassName(),theRequest.getUserID());
@@ -128,15 +128,15 @@ public class AuthCheckThread extends Thr
// Repeat, and only go to sleep if there are no more requests.
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
- if (e.getErrorCode() == ACFException.INTERRUPTED)
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
break;
// Log it, but keep the thread alive
Logging.authorityService.error("Exception tossed: "+e.getMessage(),e);
- if (e.getErrorCode() == ACFException.SETUP_ERROR)
+ if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
{
// Shut the whole system down!
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java Mon Oct 4 14:32:19 2010
@@ -38,7 +38,7 @@ public class IdleCleanupThread extends T
/** Constructor.
*/
public IdleCleanupThread()
- throws ACFException
+ throws ManifoldCFException
{
super();
setName("Idle cleanup thread");
@@ -60,17 +60,17 @@ public class IdleCleanupThread extends T
AuthorityConnectorFactory.pollAllConnectors(threadContext);
// Sleep for the retry interval.
- ACF.sleep(15000L);
+ ManifoldCF.sleep(15000L);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
- if (e.getErrorCode() == ACFException.INTERRUPTED)
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
break;
// Log it, but keep the thread alive
Logging.authorityService.error("Exception tossed",e);
- if (e.getErrorCode() == ACFException.SETUP_ERROR)
+ if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
{
// Shut the whole system down!
System.exit(1);
Added: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/ManifoldCF.java?rev=1004255&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/ManifoldCF.java (added)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/ManifoldCF.java Mon Oct 4 14:32:19 2010
@@ -0,0 +1,238 @@
+/* $Id: ManifoldCF.java 988245 2010-08-23 18:39:35Z kwright $ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.authorities.system;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.authorities.interfaces.*;
+import java.io.*;
+import java.util.*;
+
+public class ManifoldCF extends org.apache.manifoldcf.core.system.ManifoldCF
+{
+ // Initialization needed flag
+ protected static boolean authoritiesInitialized = false;
+
+ // Threads
+ protected static IdleCleanupThread idleCleanupThread = null;
+ protected static AuthCheckThread[] authCheckThreads = null;
+
+ // Number of auth check threads
+ protected static int numAuthCheckThreads = 0;
+
+ protected static final String authCheckThreadCountProperty = "org.apache.manifoldcf.authorityservice.threads";
+
+ // Request queue
+ protected static RequestQueue requestQueue = null;
+
+ /** Initialize environment.
+ */
+ public static void initializeEnvironment()
+ throws ManifoldCFException
+ {
+ synchronized (initializeFlagLock)
+ {
+ if (authoritiesInitialized)
+ return;
+
+ org.apache.manifoldcf.core.system.ManifoldCF.initializeEnvironment();
+ Logging.initializeLoggers();
+ Logging.setLogLevels();
+ authoritiesInitialized = true;
+ }
+ }
+
+
+ /** Install all the authority manager system tables.
+ *@param threadcontext is the thread context.
+ */
+ public static void installSystemTables(IThreadContext threadcontext)
+ throws ManifoldCFException
+ {
+ IDBInterface mainDatabase = DBInterfaceFactory.make(threadcontext,
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
+
+ IAuthorityConnectorManager connMgr = AuthorityConnectorManagerFactory.make(threadcontext);
+ IAuthorityConnectionManager authConnMgr = AuthorityConnectionManagerFactory.make(threadcontext);
+
+ mainDatabase.beginTransaction();
+ try
+ {
+ connMgr.install();
+ authConnMgr.install();
+ }
+ catch (ManifoldCFException e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ mainDatabase.endTransaction();
+ }
+
+ }
+
+ /** Uninstall all the authority manager system tables.
+ *@param threadcontext is the thread context.
+ */
+ public static void deinstallSystemTables(IThreadContext threadcontext)
+ throws ManifoldCFException
+ {
+ IDBInterface mainDatabase = DBInterfaceFactory.make(threadcontext,
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
+
+ ManifoldCFException se = null;
+
+ IAuthorityConnectorManager connMgr = AuthorityConnectorManagerFactory.make(threadcontext);
+ IAuthorityConnectionManager authConnMgr = AuthorityConnectionManagerFactory.make(threadcontext);
+
+ mainDatabase.beginTransaction();
+ try
+ {
+ authConnMgr.deinstall();
+ connMgr.deinstall();
+ }
+ catch (ManifoldCFException e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ mainDatabase.endTransaction();
+ }
+ if (se != null)
+ throw se;
+
+ }
+
+ /** Start the authority system.
+ */
+ public static void startSystem(IThreadContext threadContext)
+ throws ManifoldCFException
+ {
+ // Read any parameters
+ String maxThreads = getProperty(authCheckThreadCountProperty);
+ if (maxThreads == null)
+ maxThreads = "10";
+ numAuthCheckThreads = new Integer(maxThreads).intValue();
+ if (numAuthCheckThreads < 1 || numAuthCheckThreads > 100)
+ throw new ManifoldCFException("Illegal value for the number of auth check threads");
+
+ // Start up threads
+ idleCleanupThread = new IdleCleanupThread();
+ idleCleanupThread.start();
+
+ requestQueue = new RequestQueue();
+
+ authCheckThreads = new AuthCheckThread[numAuthCheckThreads];
+ int i = 0;
+ while (i < numAuthCheckThreads)
+ {
+ authCheckThreads[i] = new AuthCheckThread(Integer.toString(i),requestQueue);
+ authCheckThreads[i].start();
+ i++;
+ }
+ }
+
+ /** Shut down the authority system.
+ */
+ public static void stopSystem(IThreadContext threadContext)
+ throws ManifoldCFException
+ {
+
+ while (idleCleanupThread != null || authCheckThreads != null)
+ {
+ if (idleCleanupThread != null)
+ {
+ idleCleanupThread.interrupt();
+ }
+ if (authCheckThreads != null)
+ {
+ int i = 0;
+ while (i < authCheckThreads.length)
+ {
+ Thread authCheckThread = authCheckThreads[i++];
+ if (authCheckThread != null)
+ authCheckThread.interrupt();
+ }
+ }
+
+ if (idleCleanupThread != null)
+ {
+ if (!idleCleanupThread.isAlive())
+ idleCleanupThread = null;
+ }
+ if (authCheckThreads != null)
+ {
+ int i = 0;
+ boolean isAlive = false;
+ while (i < authCheckThreads.length)
+ {
+ Thread authCheckThread = authCheckThreads[i];
+ if (authCheckThread != null)
+ {
+ if (!authCheckThread.isAlive())
+ authCheckThreads[i] = null;
+ else
+ isAlive = true;
+ }
+ i++;
+ }
+ if (!isAlive)
+ authCheckThreads = null;
+ }
+
+ try
+ {
+ ManifoldCF.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ }
+ }
+
+ // Release all authority connectors
+ AuthorityConnectorFactory.closeAllConnectors(threadContext);
+ numAuthCheckThreads = 0;
+ requestQueue = null;
+ }
+
+ /** Get the current request queue */
+ public static RequestQueue getRequestQueue()
+ {
+ return requestQueue;
+ }
+
+}
+
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AbortJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AbortJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AbortJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AbortJob.java Mon Oct 4 14:32:19 2010
@@ -49,7 +49,7 @@ public class AbortJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
jobManager.manualAbort(new Long(jobID));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AddScheduledTime.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AddScheduledTime.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AddScheduledTime.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AddScheduledTime.java Mon Oct 4 14:32:19 2010
@@ -63,13 +63,13 @@ public class AddScheduledTime
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription desc = jobManager.load(new Long(jobID));
if (desc == null)
- throw new ACFException("No such job: '"+jobID+"'");
+ throw new ManifoldCFException("No such job: '"+jobID+"'");
ScheduleRecord sr = new ScheduleRecord(
parseDayOfWeek(dayOfWeekList),
@@ -134,7 +134,7 @@ public class AddScheduledTime
return 5;
if (day.equals("saturday"))
return 6;
- throw new ACFException("Bad day of week: '"+day+"'");
+ throw new ManifoldCFException("Bad day of week: '"+day+"'");
}
protected static EnumeratedValues parseMonthOfYear(String list)
@@ -190,7 +190,7 @@ public class AddScheduledTime
if (day.equals("december"))
return 11;
- throw new ACFException("Bad month: '"+day+"'");
+ throw new ManifoldCFException("Bad month: '"+day+"'");
}
protected static EnumeratedValues parseDayOfMonth(String list)
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/BaseCrawlerInitializationCommand.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/BaseCrawlerInitializationCommand.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/BaseCrawlerInitializationCommand.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/BaseCrawlerInitializationCommand.java Mon Oct 4 14:32:19 2010
@@ -2,22 +2,22 @@ package org.apache.manifoldcf.crawler;
import org.apache.manifoldcf.core.InitializationCommand;
import org.apache.manifoldcf.core.interfaces.IThreadContext;
-import org.apache.manifoldcf.core.interfaces.ACFException;
+import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
import org.apache.manifoldcf.core.interfaces.ThreadContextFactory;
-import org.apache.manifoldcf.crawler.system.ACF;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
/**
* @author Jettro Coenradie
*/
public abstract class BaseCrawlerInitializationCommand implements InitializationCommand
{
- public void execute() throws ACFException
+ public void execute() throws ManifoldCFException
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
doExecute(tc);
}
- protected abstract void doExecute(IThreadContext tc) throws ACFException;
+ protected abstract void doExecute(IThreadContext tc) throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ChangeJobDocSpec.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ChangeJobDocSpec.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ChangeJobDocSpec.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ChangeJobDocSpec.java Mon Oct 4 14:32:19 2010
@@ -48,7 +48,7 @@ public class ChangeJobDocSpec
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription desc = jobManager.load(new Long(jobID));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/CheckConfigured.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/CheckConfigured.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/CheckConfigured.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/CheckConfigured.java Mon Oct 4 14:32:19 2010
@@ -46,7 +46,7 @@ public class CheckConfigured
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
if (connManager.getAllConnections().length > 0)
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineJob.java Mon Oct 4 14:32:19 2010
@@ -68,7 +68,7 @@ public class DefineJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription desc = jobManager.createJob();
@@ -82,7 +82,7 @@ public class DefineJob
else if (typeString.equals("specified"))
desc.setType(IJobDescription.TYPE_SPECIFIED);
else
- throw new ACFException("Unknown type: '"+typeString+"'");
+ throw new ManifoldCFException("Unknown type: '"+typeString+"'");
if (startString.equals("windowbegin"))
desc.setStartMethod(IJobDescription.START_WINDOWBEGIN);
else if (startString.equals("windowinside"))
@@ -90,7 +90,7 @@ public class DefineJob
else if (startString.equals("disable"))
desc.setStartMethod(IJobDescription.START_DISABLE);
else
- throw new ACFException("Unknown start method: '"+startString+"'");
+ throw new ManifoldCFException("Unknown start method: '"+startString+"'");
if (hopcountString.equals("accurate"))
desc.setHopcountMode(IJobDescription.HOPCOUNT_ACCURATE);
@@ -99,7 +99,7 @@ public class DefineJob
else if (hopcountString.equals("neverdelete"))
desc.setHopcountMode(IJobDescription.HOPCOUNT_NEVERDELETE);
else
- throw new ACFException("Unknown hopcount mode: '"+hopcountString+"'");
+ throw new ManifoldCFException("Unknown hopcount mode: '"+hopcountString+"'");
if (recrawlInterval.length() > 0)
desc.setInterval(new Long(recrawlInterval));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineRepositoryConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineRepositoryConnection.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineRepositoryConnection.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineRepositoryConnection.java Mon Oct 4 14:32:19 2010
@@ -52,7 +52,7 @@ public class DefineRepositoryConnection
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager mgr = RepositoryConnectionManagerFactory.make(tc);
IRepositoryConnection conn = mgr.create();
@@ -70,7 +70,7 @@ public class DefineRepositoryConnection
// Parse
int pos = arg.indexOf("=");
if (pos == -1)
- throw new ACFException("Argument missing =");
+ throw new ManifoldCFException("Argument missing =");
String name = arg.substring(0,pos);
String value = arg.substring(pos+1);
if (name.endsWith("assword"))
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteJob.java Mon Oct 4 14:32:19 2010
@@ -47,7 +47,7 @@ public class DeleteJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
jobManager.deleteJob(new Long(jobID));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteRepositoryConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteRepositoryConnection.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteRepositoryConnection.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DeleteRepositoryConnection.java Mon Oct 4 14:32:19 2010
@@ -46,7 +46,7 @@ public class DeleteRepositoryConnection
String connectionName = args[0];
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager mgr = RepositoryConnectionManagerFactory.make(tc);
mgr.delete(connectionName);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ExportConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ExportConfiguration.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ExportConfiguration.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ExportConfiguration.java Mon Oct 4 14:32:19 2010
@@ -35,9 +35,9 @@ public class ExportConfiguration extends
this.exportFilename = exportFilename;
}
- protected void doExecute(IThreadContext tc) throws ACFException
+ protected void doExecute(IThreadContext tc) throws ManifoldCFException
{
- ACF.exportConfiguration(tc,exportFilename);
+ ManifoldCF.exportConfiguration(tc,exportFilename);
Logging.root.info("Configuration exported");
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/FindJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/FindJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/FindJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/FindJob.java Mon Oct 4 14:32:19 2010
@@ -48,7 +48,7 @@ public class FindJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription[] jobs = jobManager.getAllJobs();
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/GetJobSchedule.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/GetJobSchedule.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/GetJobSchedule.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/GetJobSchedule.java Mon Oct 4 14:32:19 2010
@@ -49,13 +49,13 @@ public class GetJobSchedule
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription job = jobManager.load(new Long(jobID));
if (job == null)
- throw new ACFException("No such job: "+jobID);
+ throw new ManifoldCFException("No such job: "+jobID);
int i = 0;
while (i < job.getScheduleRecordCount())
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ImportConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ImportConfiguration.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ImportConfiguration.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ImportConfiguration.java Mon Oct 4 14:32:19 2010
@@ -35,9 +35,9 @@ public class ImportConfiguration extends
this.importFilename = importFilename;
}
- protected void doExecute(IThreadContext tc) throws ACFException
+ protected void doExecute(IThreadContext tc) throws ManifoldCFException
{
- ACF.importConfiguration(tc,importFilename);
+ ManifoldCF.importConfiguration(tc,importFilename);
Logging.root.info("Configuration imported");
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobStatuses.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobStatuses.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobStatuses.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobStatuses.java Mon Oct 4 14:32:19 2010
@@ -47,7 +47,7 @@ public class ListJobStatuses
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
JobStatus[] jobStatuses = jobManager.getAllStatus();
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobs.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobs.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobs.java Mon Oct 4 14:32:19 2010
@@ -47,7 +47,7 @@ public class ListJobs
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription[] jobs = jobManager.getAllJobs();
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/PauseJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/PauseJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/PauseJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/PauseJob.java Mon Oct 4 14:32:19 2010
@@ -49,7 +49,7 @@ public class PauseJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
jobManager.pauseJob(new Long(jobID));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/Register.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/Register.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/Register.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/Register.java Mon Oct 4 14:32:19 2010
@@ -38,7 +38,7 @@ public class Register extends Transactio
this.description = description;
}
- protected void doExecute(IThreadContext tc) throws ACFException
+ protected void doExecute(IThreadContext tc) throws ManifoldCFException
{
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -71,7 +71,7 @@ public class Register extends Transactio
register.execute();
System.err.println("Successfully registered connector '"+className+"'");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RestartJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RestartJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RestartJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RestartJob.java Mon Oct 4 14:32:19 2010
@@ -49,7 +49,7 @@ public class RestartJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
jobManager.restartJob(new Long(jobID));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunDocumentStatus.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunDocumentStatus.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunDocumentStatus.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunDocumentStatus.java Mon Oct 4 14:32:19 2010
@@ -75,7 +75,7 @@ public class RunDocumentStatus
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -172,7 +172,7 @@ public class RunDocumentStatus
String state = states[i].trim();
Integer value = (Integer)stateMap.get(state.toLowerCase());
if (value == null)
- throw new ACFException("State value of '"+state+"' is illegal");
+ throw new ManifoldCFException("State value of '"+state+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
@@ -204,7 +204,7 @@ public class RunDocumentStatus
String status = statuses[i].trim();
Integer value = (Integer)statusMap.get(status.toLowerCase());
if (value == null)
- throw new ACFException("Status value of '"+status+"' is illegal");
+ throw new ManifoldCFException("Status value of '"+status+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxActivityHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxActivityHistory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxActivityHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxActivityHistory.java Mon Oct 4 14:32:19 2010
@@ -72,7 +72,7 @@ public class RunMaxActivityHistory
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxBandwidthHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxBandwidthHistory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxBandwidthHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxBandwidthHistory.java Mon Oct 4 14:32:19 2010
@@ -72,7 +72,7 @@ public class RunMaxBandwidthHistory
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunQueueStatus.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunQueueStatus.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunQueueStatus.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunQueueStatus.java Mon Oct 4 14:32:19 2010
@@ -77,7 +77,7 @@ public class RunQueueStatus
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -174,7 +174,7 @@ public class RunQueueStatus
String state = states[i].trim();
Integer value = (Integer)stateMap.get(state.toLowerCase());
if (value == null)
- throw new ACFException("State value of '"+state+"' is illegal");
+ throw new ManifoldCFException("State value of '"+state+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
@@ -206,7 +206,7 @@ public class RunQueueStatus
String status = statuses[i].trim();
Integer value = (Integer)statusMap.get(status.toLowerCase());
if (value == null)
- throw new ACFException("Status value of '"+status+"' is illegal");
+ throw new ManifoldCFException("Status value of '"+status+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunResultHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunResultHistory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunResultHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunResultHistory.java Mon Oct 4 14:32:19 2010
@@ -73,7 +73,7 @@ public class RunResultHistory
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunSimpleHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunSimpleHistory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunSimpleHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunSimpleHistory.java Mon Oct 4 14:32:19 2010
@@ -70,7 +70,7 @@ public class RunSimpleHistory
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/StartJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/StartJob.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/StartJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/StartJob.java Mon Oct 4 14:32:19 2010
@@ -49,7 +49,7 @@ public class StartJob
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
jobManager.manualStart(new Long(jobID));
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/SynchronizeConnectors.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/SynchronizeConnectors.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/SynchronizeConnectors.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/SynchronizeConnectors.java Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@ package org.apache.manifoldcf.crawler;
import org.apache.manifoldcf.core.interfaces.*;
import org.apache.manifoldcf.crawler.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ACF;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
import org.apache.manifoldcf.crawler.system.Logging;
@@ -35,12 +35,12 @@ public class SynchronizeConnectors exten
{
}
- protected void doExecute(IThreadContext tc) throws ACFException
+ protected void doExecute(IThreadContext tc) throws ManifoldCFException
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
@@ -54,7 +54,7 @@ public class SynchronizeConnectors exten
{
RepositoryConnectorFactory.getConnectorNoCheck(className);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// Deregistration should be done in a transaction
database.beginTransaction();
@@ -67,7 +67,7 @@ public class SynchronizeConnectors exten
// Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
mgr.removeConnector(className);
}
- catch (ACFException e2)
+ catch (ManifoldCFException e2)
{
database.signalRollback();
throw e2;
@@ -101,7 +101,7 @@ public class SynchronizeConnectors exten
synchronizeConnectors.execute();
System.err.println("Successfully synchronized all connectors");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/TransactionalCrawlerInitializationCommand.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/TransactionalCrawlerInitializationCommand.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/TransactionalCrawlerInitializationCommand.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/TransactionalCrawlerInitializationCommand.java Mon Oct 4 14:32:19 2010
@@ -2,28 +2,28 @@ package org.apache.manifoldcf.crawler;
import org.apache.manifoldcf.core.InitializationCommand;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ACF;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
/**
* @author Jettro Coenradie
*/
public abstract class TransactionalCrawlerInitializationCommand implements InitializationCommand
{
- public void execute() throws ACFException
+ public void execute() throws ManifoldCFException
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IDBInterface database = DBInterfaceFactory.make(tc,
- org.apache.manifoldcf.agents.system.ACF.getMasterDatabaseName(),
- org.apache.manifoldcf.agents.system.ACF.getMasterDatabaseUsername(),
- org.apache.manifoldcf.agents.system.ACF.getMasterDatabasePassword());
+ org.apache.manifoldcf.agents.system.ManifoldCF.getMasterDatabaseName(),
+ org.apache.manifoldcf.agents.system.ManifoldCF.getMasterDatabaseUsername(),
+ org.apache.manifoldcf.agents.system.ManifoldCF.getMasterDatabasePassword());
try
{
database.beginTransaction();
doExecute(tc);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
database.signalRollback();
throw e;
@@ -40,6 +40,6 @@ public abstract class TransactionalCrawl
}
- protected abstract void doExecute(IThreadContext tc) throws ACFException;
+ protected abstract void doExecute(IThreadContext tc) throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegister.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegister.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegister.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegister.java Mon Oct 4 14:32:19 2010
@@ -36,7 +36,7 @@ public class UnRegister extends Transact
this.className = className;
}
- protected void doExecute(IThreadContext tc) throws ACFException
+ protected void doExecute(IThreadContext tc) throws ManifoldCFException
{
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -65,7 +65,7 @@ public class UnRegister extends Transact
unRegister.execute();
System.err.println("Successfully unregistered connector '"+className+"'");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegisterAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegisterAll.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegisterAll.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/UnRegisterAll.java Mon Oct 4 14:32:19 2010
@@ -33,12 +33,12 @@ public class UnRegisterAll extends BaseC
{
}
- protected void doExecute(IThreadContext tc) throws ACFException
+ protected void doExecute(IThreadContext tc) throws ManifoldCFException
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
@@ -59,7 +59,7 @@ public class UnRegisterAll extends BaseC
// Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
mgr.unregisterConnector(className);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
database.signalRollback();
throw e;
@@ -92,7 +92,7 @@ public class UnRegisterAll extends BaseC
unRegisterAll.execute();
System.err.println("Successfully unregistered all connectors");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobDeleted.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobDeleted.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobDeleted.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobDeleted.java Mon Oct 4 14:32:19 2010
@@ -49,7 +49,7 @@ public class WaitForJobDeleted
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
while (true)
@@ -57,7 +57,7 @@ public class WaitForJobDeleted
JobStatus status = jobManager.getStatus(new Long(jobID));
if (status == null)
break;
- ACF.sleep(10000);
+ ManifoldCF.sleep(10000);
}
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobInactive.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobInactive.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobInactive.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitForJobInactive.java Mon Oct 4 14:32:19 2010
@@ -49,7 +49,7 @@ public class WaitForJobInactive
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -57,7 +57,7 @@ public class WaitForJobInactive
{
JobStatus status = jobManager.getStatus(new Long(jobID));
if (status == null)
- throw new ACFException("No such job: '"+jobID+"'");
+ throw new ManifoldCFException("No such job: '"+jobID+"'");
int statusValue = status.getStatus();
switch (statusValue)
{
@@ -71,7 +71,7 @@ public class WaitForJobInactive
System.out.println("Error: "+status.getErrorText());
break;
default:
- ACF.sleep(10000);
+ ManifoldCF.sleep(10000);
continue;
}
break;
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitJobPaused.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitJobPaused.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitJobPaused.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/WaitJobPaused.java Mon Oct 4 14:32:19 2010
@@ -49,14 +49,14 @@ public class WaitJobPaused
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
while (true)
{
if (jobManager.checkJobBusy(new Long(jobID)))
{
- ACF.sleep(5000);
+ ManifoldCF.sleep(5000);
continue;
}
break;
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java Mon Oct 4 14:32:19 2010
@@ -25,7 +25,7 @@ import org.apache.manifoldcf.crawler.int
import java.io.*;
import java.util.*;
-/** This base class describes an instance of a connection between a repository and ACF's
+/** This base class describes an instance of a connection between a repository and ManifoldCF's
* standard "pull" ingestion agent.
*
* Each instance of this interface is used in only one thread at a time. Connection Pooling
@@ -112,7 +112,7 @@ public abstract class BaseRepositoryConn
*@return true if the resource is found, false if not. In either case, output may be filled in.
*/
public boolean requestInfo(Configuration output, String command)
- throws ACFException
+ throws ManifoldCFException
{
return false;
}
@@ -145,7 +145,7 @@ public abstract class BaseRepositoryConn
*/
public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime, int jobMode)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
addSeedDocuments(activities,spec,startTime,endTime);
}
@@ -177,7 +177,7 @@ public abstract class BaseRepositoryConn
*/
public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Call the old-style methods that get document identifiers, and then queue
// them using the new activities-based methods
@@ -226,7 +226,7 @@ public abstract class BaseRepositoryConn
*/
public IDocumentIdentifierStream getDocumentIdentifiers(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getDocumentIdentifiers(spec,startTime,endTime);
}
@@ -239,7 +239,7 @@ public abstract class BaseRepositoryConn
*/
public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec,
long startTime, long endTime)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Something provided here so we can override either one.
return null;
@@ -262,7 +262,7 @@ public abstract class BaseRepositoryConn
*/
public IDocumentIdentifierStream getRemainingDocumentIdentifiers(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Usually we don't need to worry about this.
return null;
@@ -287,7 +287,7 @@ public abstract class BaseRepositoryConn
*/
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getDocumentVersions(documentIdentifiers,oldVersions,activities,spec,jobMode);
}
@@ -310,7 +310,7 @@ public abstract class BaseRepositoryConn
*/
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
DocumentSpecification spec, int jobMode)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getDocumentVersions(documentIdentifiers,oldVersions,activities,spec);
}
@@ -331,7 +331,7 @@ public abstract class BaseRepositoryConn
* will always be processed.
*/
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities, DocumentSpecification spec)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getDocumentVersions(documentIdentifiers,activities,spec);
}
@@ -350,7 +350,7 @@ public abstract class BaseRepositoryConn
* will always be processed.
*/
public String[] getDocumentVersions(String[] documentIdentifiers, IVersionActivity activities, DocumentSpecification spec)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
return getDocumentVersions(documentIdentifiers,spec);
}
@@ -368,7 +368,7 @@ public abstract class BaseRepositoryConn
* will always be processed.
*/
public String[] getDocumentVersions(String[] documentIdentifiers, DocumentSpecification spec)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Return unknown versions
String[] rval = new String[documentIdentifiers.length];
@@ -388,7 +388,7 @@ public abstract class BaseRepositoryConn
*@param versions is the corresponding set of version identifiers (individual identifiers may be null).
*/
public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
- throws ACFException
+ throws ManifoldCFException
{
// Base implementation does nothing
}
@@ -418,7 +418,7 @@ public abstract class BaseRepositoryConn
*/
public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities,
DocumentSpecification spec, boolean[] scanOnly, int jobMode)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
processDocuments(documentIdentifiers,versions,activities,spec,scanOnly);
}
@@ -438,7 +438,7 @@ public abstract class BaseRepositoryConn
*/
public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities,
DocumentSpecification spec, boolean[] scanOnly)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Does nothing; override to make something happen
}
@@ -459,7 +459,7 @@ public abstract class BaseRepositoryConn
*@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
*/
public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, ArrayList tabsArray)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
}
@@ -472,7 +472,7 @@ public abstract class BaseRepositoryConn
*@param tabName is the current tab name.
*/
public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
}
@@ -485,7 +485,7 @@ public abstract class BaseRepositoryConn
*@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
*/
public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification ds)
- throws ACFException
+ throws ManifoldCFException
{
return null;
}
@@ -497,7 +497,7 @@ public abstract class BaseRepositoryConn
*@param ds is the current document specification for this job.
*/
public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java Mon Oct 4 14:32:19 2010
@@ -41,7 +41,7 @@ public class ConnectorManager extends or
*@param database is the database handle.
*/
public ConnectorManager(IThreadContext threadContext, IDBInterface database)
- throws ACFException
+ throws ManifoldCFException
{
super(database,"connectors");
this.threadContext = threadContext;
@@ -51,7 +51,7 @@ public class ConnectorManager extends or
/** Install or upgrade.
*/
public void install()
- throws ACFException
+ throws ManifoldCFException
{
// Always do an outer loop, to support upgrade complexities
while (true)
@@ -96,7 +96,7 @@ public class ConnectorManager extends or
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -115,7 +115,7 @@ public class ConnectorManager extends or
}
performDrop(invKeys);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -137,7 +137,7 @@ public class ConnectorManager extends or
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
beginTransaction();
@@ -164,7 +164,7 @@ public class ConnectorManager extends or
// Either way, we must do the install/upgrade itself.
RepositoryConnectorFactory.install(threadContext,className);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -185,7 +185,7 @@ public class ConnectorManager extends or
*@param className is the class of the connector to unregister.
*/
public void unregisterConnector(String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
beginTransaction();
@@ -196,7 +196,7 @@ public class ConnectorManager extends or
removeConnector(className);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -218,7 +218,7 @@ public class ConnectorManager extends or
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
ArrayList list = new ArrayList();
@@ -231,7 +231,7 @@ public class ConnectorManager extends or
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -244,7 +244,7 @@ public class ConnectorManager extends or
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -263,7 +263,7 @@ public class ConnectorManager extends or
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws ACFException
+ throws ManifoldCFException
{
// Use the global table key; that's good enough because we don't expect stuff to change out from under very often.
StringSet invKeys = new StringSet(getCacheKey());
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ConnectorManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ConnectorManagerFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ConnectorManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ConnectorManagerFactory.java Mon Oct 4 14:32:19 2010
@@ -38,16 +38,16 @@ public class ConnectorManagerFactory
*@return the connector manager handle.
*/
public static IConnectorManager make(IThreadContext tc)
- throws ACFException
+ throws ManifoldCFException
{
Object o = tc.get(connMgr);
if (o == null || !(o instanceof IConnectorManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.crawler.connmgr.ConnectorManager(tc,database);
tc.save(connMgr,o);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/DocumentSpecification.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/DocumentSpecification.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/DocumentSpecification.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/DocumentSpecification.java Mon Oct 4 14:32:19 2010
@@ -38,7 +38,7 @@ public class DocumentSpecification exten
*@param xml is the input XML.
*/
public DocumentSpecification(String xml)
- throws ACFException
+ throws ManifoldCFException
{
super(xml);
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IAbortActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IAbortActivity.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IAbortActivity.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IAbortActivity.java Mon Oct 4 14:32:19 2010
@@ -34,6 +34,6 @@ public interface IAbortActivity
* caller, will signal that the current seeding activity remains incomplete and must be retried when the job is resumed.
*/
public void checkJobStillActive()
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IConnectorManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IConnectorManager.java Mon Oct 4 14:32:19 2010
@@ -30,12 +30,12 @@ public interface IConnectorManager
/** Install.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Register a new connector.
* The connector's install method will also be called.
@@ -43,14 +43,14 @@ public interface IConnectorManager
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Unregister a connector.
* The connector's deinstall method will also be called.
*@param className is the connector class to unregister.
*/
public void unregisterConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Remove a connector.
* Use this method when the connector doesn't seem to be in the
@@ -58,27 +58,27 @@ public interface IConnectorManager
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Get ordered list of connectors.
*@return a resultset with the columns "description" and "classname".
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws ACFException;
+ throws ManifoldCFException;
/** Get a description given a class name.
*@param className is the class name.
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Check if a particular connector is installed or not.
*@param className is the class name of the connector.
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IDocumentIdentifierStream.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IDocumentIdentifierStream.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IDocumentIdentifierStream.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IDocumentIdentifierStream.java Mon Oct 4 14:32:19 2010
@@ -37,11 +37,11 @@ public interface IDocumentIdentifierStre
*@return the next document identifier, or null if there are no more.
*/
public String getNextIdentifier()
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Close the stream.
*/
public void close()
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IEventActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IEventActivity.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IEventActivity.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IEventActivity.java Mon Oct 4 14:32:19 2010
@@ -74,7 +74,7 @@ public interface IEventActivity extends
*@return false if the event is already in the "pending" state.
*/
public boolean beginEventSequence(String eventName)
- throws ACFException;
+ throws ManifoldCFException;
/** Complete an event sequence.
* This method should be called to signal that an event is no longer in the "pending" state. This can mean that the prerequisite processing is
@@ -84,7 +84,7 @@ public interface IEventActivity extends
*@param eventName is the event name.
*/
public void completeEventSequence(String eventName)
- throws ACFException;
+ throws ManifoldCFException;
/** Abort processing a document (for sequencing reasons).
* This method should be called in order to cause the specified document to be requeued for later processing. While this is similar in some respects
@@ -93,7 +93,7 @@ public interface IEventActivity extends
*@param localIdentifier is the document identifier to requeue
*/
public void retryDocumentProcessing(String localIdentifier)
- throws ACFException;
+ throws ManifoldCFException;
}