incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r911029 [8/19] - in /incubator/lcf/trunk: modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/ modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/ modules/connectors/documentum/crawler...
Date Wed, 17 Feb 2010 15:57:35 GMT
Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/SynchronizeOutputs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/SynchronizeOutputs.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/SynchronizeOutputs.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/SynchronizeOutputs.java Wed Feb 17 15:57:27 2010
@@ -42,12 +42,12 @@
 
                 try
                 {
-                        Metacarta.initializeEnvironment();
+                        LCF.initializeEnvironment();
                         IThreadContext tc = ThreadContextFactory.make();
                         IDBInterface database = DBInterfaceFactory.make(tc,
-                                Metacarta.getMasterDatabaseName(),
-                                Metacarta.getMasterDatabaseUsername(),
-                                Metacarta.getMasterDatabasePassword());
+                                LCF.getMasterDatabaseName(),
+                                LCF.getMasterDatabaseUsername(),
+                                LCF.getMasterDatabasePassword());
                         IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
                         IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
                         IResultSet classNames = mgr.getConnectors();
@@ -60,7 +60,7 @@
                             {
                                 OutputConnectorFactory.getConnectorNoCheck(className);
                             }
-                            catch (MetacartaException e)
+                            catch (LCFException e)
                             {
                                 // Deregistration should be done in a transaction
                                 database.beginTransaction();
@@ -73,7 +73,7 @@
                                         // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
                                         mgr.removeConnector(className);
                                 }
-                                catch (MetacartaException e2)
+                                catch (LCFException e2)
                                 {
                                         database.signalRollback();
                                         throw e2;
@@ -91,7 +91,7 @@
                         }
                         System.err.println("Successfully synchronized all outputs");
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         e.printStackTrace();
                         System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegister.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegister.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegister.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegister.java Wed Feb 17 15:57:27 2010
@@ -44,13 +44,13 @@
 
 		try
 		{
-			Metacarta.initializeEnvironment();
+			LCF.initializeEnvironment();
 			IThreadContext tc = ThreadContextFactory.make();
 			IAgentManager mgr = AgentManagerFactory.make(tc);
 			mgr.unregisterAgent(className);
 			System.err.println("Successfully unregistered agent '"+className+"'");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace();
 			System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAll.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAll.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAll.java Wed Feb 17 15:57:27 2010
@@ -42,7 +42,7 @@
 
 		try
 		{
-			Metacarta.initializeEnvironment();
+			LCF.initializeEnvironment();
 			IThreadContext tc = ThreadContextFactory.make();
 			IAgentManager mgr = AgentManagerFactory.make(tc);
 			String[] classnames = mgr.getAllAgents();
@@ -53,7 +53,7 @@
 			}
 			System.err.println("Successfully unregistered all agents");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace();
 			System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAllOutputs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAllOutputs.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAllOutputs.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterAllOutputs.java Wed Feb 17 15:57:27 2010
@@ -42,12 +42,12 @@
 
                 try
                 {
-                        Metacarta.initializeEnvironment();
+                        LCF.initializeEnvironment();
                         IThreadContext tc = ThreadContextFactory.make();
                         IDBInterface database = DBInterfaceFactory.make(tc,
-                                Metacarta.getMasterDatabaseName(),
-                                Metacarta.getMasterDatabaseUsername(),
-                                Metacarta.getMasterDatabasePassword());
+                                LCF.getMasterDatabaseName(),
+                                LCF.getMasterDatabaseUsername(),
+                                LCF.getMasterDatabasePassword());
                         IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
                         IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
                         IResultSet classNames = mgr.getConnectors();
@@ -67,7 +67,7 @@
                                 // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
                                 mgr.unregisterConnector(className);
                             }
-                            catch (MetacartaException e)
+                            catch (LCFException e)
                             {
                                 database.signalRollback();
                                 throw e;
@@ -84,7 +84,7 @@
                         }
                         System.err.println("Successfully unregistered all output connectors");
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         e.printStackTrace();
                         System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterOutput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterOutput.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterOutput.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/UnRegisterOutput.java Wed Feb 17 15:57:27 2010
@@ -44,12 +44,12 @@
 
                 try
                 {
-                        Metacarta.initializeEnvironment();
+                        LCF.initializeEnvironment();
                         IThreadContext tc = ThreadContextFactory.make();
                         IDBInterface database = DBInterfaceFactory.make(tc,
-                                Metacarta.getMasterDatabaseName(),
-                                Metacarta.getMasterDatabaseUsername(),
-                                Metacarta.getMasterDatabasePassword());
+                                LCF.getMasterDatabaseName(),
+                                LCF.getMasterDatabaseUsername(),
+                                LCF.getMasterDatabasePassword());
                         IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
                         IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
                         // Deregistration should be done in a transaction
@@ -63,7 +63,7 @@
                                 // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
                                 mgr.unregisterConnector(className);
                         }
-                        catch (MetacartaException e)
+                        catch (LCFException e)
                         {
                                 database.signalRollback();
                                 throw e;
@@ -79,7 +79,7 @@
                         }
                         System.err.println("Successfully unregistered output connector '"+className+"'");
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         e.printStackTrace();
                         System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/Uninstall.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/Uninstall.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/Uninstall.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/Uninstall.java Wed Feb 17 15:57:27 2010
@@ -43,12 +43,12 @@
 
 		try
 		{
-			Metacarta.initializeEnvironment();
+			LCF.initializeEnvironment();
 			IThreadContext tc = ThreadContextFactory.make();
-			Metacarta.deinstallTables(tc);
+			LCF.deinstallTables(tc);
 			System.err.println("Agent tables uninstalled");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace();
 			System.exit(1);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/agentmanager/AgentManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/agentmanager/AgentManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/agentmanager/AgentManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/agentmanager/AgentManager.java Wed Feb 17 15:57:27 2010
@@ -39,7 +39,7 @@
 	*@param database is the database instance.
 	*/
 	public AgentManager(IThreadContext threadContext, IDBInterface database)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(database,"agents");
 		this.threadContext = threadContext;
@@ -48,7 +48,7 @@
 	/** Install or upgrade.
 	*/
 	public void install()
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -62,7 +62,7 @@
 				performCreate(map,null);
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -81,7 +81,7 @@
 	/** Uninstall.  Also uninstalls all remaining agents.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
 		// Since we are uninstalling agents, better do this inside a transaction
 		beginTransaction();
@@ -99,7 +99,7 @@
 			}
 			performDrop(null);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -120,7 +120,7 @@
 	*@param className is the class.
 	*/
 	public void registerAgent(String className)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Do in a transaction, so the installation is atomic
 		beginTransaction();
@@ -141,7 +141,7 @@
 			IAgent agent = AgentFactory.make(threadContext,className);
 			agent.install();
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -162,7 +162,7 @@
 	*@param className is the class to unregister.
 	*/
 	public void unregisterAgent(String className)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Do in a transaction, so the installation is atomic
 		beginTransaction();
@@ -175,7 +175,7 @@
 			// Remove from table
 			removeAgent(className);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -197,7 +197,7 @@
 	*@param className is the class to remove.
 	*/
 	public void removeAgent(String className)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Remove from table
 		ArrayList list = new ArrayList();
@@ -209,7 +209,7 @@
 	*@return the classnames in an array.
 	*/
 	public String[] getAllAgents()
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("SELECT * FROM "+getTableName(),null,null,null);
 		String[] rval = new String[set.getRowCount()];

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLContext.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLContext.java Wed Feb 17 15:57:27 2010
@@ -125,7 +125,7 @@
 		{
 			throw new SAXException(e);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw new SAXException(e);
 		}
@@ -152,7 +152,7 @@
 		{
 			throw new SAXException(e);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw new SAXException(e);
 		}
@@ -171,7 +171,7 @@
 		{
 			throw new SAXException(e);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw new SAXException(e);
 		}
@@ -181,7 +181,7 @@
 	* This method is called without fail at the end of any parse, whether it errored out or not, so that proper cleanup always happens for any tags left on the stack.
 	*/
 	public final void cleanup()
-		throws MetacartaException
+		throws LCFException
 	{
 		tagCleanup();
 		theStream.setContext(previousContext);
@@ -190,7 +190,7 @@
 	/** This method is meant to be extended by classes that extend this class.  The form of this method is meant to enable creation of a
 	* context object derived from XMLContext that understands how to actually handle tags and content within the current context. */
 	protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// The default action is to establish a new default context.
 		return null;
@@ -198,19 +198,19 @@
 		
 	/** This method is meant to be extended by classes that extend this class */
 	protected void endTag()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	}
 		
 	/** This method is meant to be extended by classes that extend this class */
 	protected void tagContents(char[] ch, int start, int length)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	}
 
 	/** Override this method to be called during cleanup */
 	protected void tagCleanup()
-		throws MetacartaException
+		throws LCFException
 	{
 	}
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLFileContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLFileContext.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLFileContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLFileContext.java Wed Feb 17 15:57:27 2010
@@ -41,7 +41,7 @@
 	
 	/** Full constructor.  Used for individual tags. */
 	public XMLFileContext(XMLStream theStream, String namespaceURI, String localname, String qname, Attributes theseAttributes, File f)
-		throws MetacartaException, UnsupportedEncodingException, FileNotFoundException
+		throws LCFException, UnsupportedEncodingException, FileNotFoundException
 	{
 		// Construct an appropriate writer
 		super(theStream,namespaceURI,localname,qname,theseAttributes,new FileOutputStream(f));
@@ -51,7 +51,7 @@
 	
 	/** Get file object, flushing it, closing it, and clearing it.  (This prevents the file from being deleted during cleanup of this context.) */
 	public File getCompletedFile()
-		throws MetacartaException
+		throws LCFException
 	{
 		flush();
 		close();
@@ -62,7 +62,7 @@
 	
 	/** Cleanup whatever is left over */
 	public void tagCleanup()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (outputFile != null)
 		{

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLOutputStreamContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLOutputStreamContext.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLOutputStreamContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLOutputStreamContext.java Wed Feb 17 15:57:27 2010
@@ -42,7 +42,7 @@
 	
 	/** Full constructor.  Used for individual tags. */
 	public XMLOutputStreamContext(XMLStream theStream, String namespaceURI, String localname, String qname, Attributes theseAttributes, OutputStream os)
-		throws MetacartaException, UnsupportedEncodingException
+		throws LCFException, UnsupportedEncodingException
 	{
 		// Construct an appropriate writer
 		super(theStream,namespaceURI,localname,qname,theseAttributes,new OutputStreamWriter(os,"utf-8"));
@@ -52,7 +52,7 @@
 	
 	/** Flush the data to the underlying output stream */
 	public void flush()
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -65,21 +65,21 @@
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception: "+e.getMessage(),e);
+			throw new LCFException("IO exception: "+e.getMessage(),e);
 		}
 	}
 	
 	/** Close the underlying stream. */
 	public void close()
-		throws MetacartaException
+		throws LCFException
 	{
 		// Now, close.
 		try
@@ -92,15 +92,15 @@
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception: "+e.getMessage(),e);
+			throw new LCFException("IO exception: "+e.getMessage(),e);
 		}
 	}
 

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStream.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStream.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStream.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStream.java Wed Feb 17 15:57:27 2010
@@ -47,7 +47,7 @@
 	/** Constructor.  This does NOT actually execute the parse yet, because we need the object before that makes any sense.
 	*/
 	public XMLStream(boolean laxChecking)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -68,49 +68,49 @@
 		catch (SAXException e)
 		{
 			Exception e2 = e.getException();
-			if (e2 != null && e2 instanceof MetacartaException)
-				throw (MetacartaException)e2;
-			throw new MetacartaException("Error setting up parser: "+e.getMessage(),e);
+			if (e2 != null && e2 instanceof LCFException)
+				throw (LCFException)e2;
+			throw new LCFException("Error setting up parser: "+e.getMessage(),e);
 		}
 	}
 	
         /** Default constructor */
         public XMLStream()
-                throws MetacartaException
+                throws LCFException
         {
                 this(true);
         }
 
 	public void parse(InputStream xmlInputStream)
-		throws MetacartaException, ServiceInterruption, IOException
+		throws LCFException, ServiceInterruption, IOException
 	{
 		try
 		{
 			InputSource is = new InputSource(xmlInputStream);
 			xr.parse(is);
 			if (parseException != null)
-				throw new MetacartaException("XML parse error: "+parseException.getMessage(),parseException);
+				throw new LCFException("XML parse error: "+parseException.getMessage(),parseException);
 		}
 		catch (SAXException e)
 		{
 			Exception e2 = e.getException();
-			if (e2 != null && e2 instanceof MetacartaException)
-				throw (MetacartaException)e2;
+			if (e2 != null && e2 instanceof LCFException)
+				throw (LCFException)e2;
 			if (e2 != null && e2 instanceof ServiceInterruption)
 				throw (ServiceInterruption)e2;
-			throw new MetacartaException("Error setting up parser: "+e.getMessage(),e);
+			throw new LCFException("Error setting up parser: "+e.getMessage(),e);
 		}
 		catch (RuntimeException e)
 		{
 			// Xerces is unfortunately not constructed in such a way that it doesn't occasionally completely barf on a malformed file.
 			// So, we catch runtime exceptions and treat them as parse errors.
-			throw new MetacartaException("XML parse error: "+e.getMessage(),e);
+			throw new LCFException("XML parse error: "+e.getMessage(),e);
 		}
 	}
 	
 	/** Call this method to clean up completely after a parse attempt, whether successful or failure. */
 	public void cleanup()
-		throws MetacartaException
+		throws LCFException
 	{
 		// This sets currentContext == null as a side effect, unless an error occurs during cleanup!!
 		currentContext.cleanup();

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStringContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStringContext.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStringContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLStringContext.java Wed Feb 17 15:57:27 2010
@@ -53,7 +53,7 @@
 	
 	/** This method is meant to be extended by classes that extend this class */
 	protected void tagContents(char[] ch, int start, int length)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Append the characters to the buffer
 		value.append(ch,start,length);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLWriterContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLWriterContext.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLWriterContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/common/XMLWriterContext.java Wed Feb 17 15:57:27 2010
@@ -41,7 +41,7 @@
 	
 	/** Full constructor.  Used for individual tags. */
 	public XMLWriterContext(XMLStream theStream, String namespaceURI, String localname, String qname, Attributes theseAttributes, Writer writer)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(theStream,namespaceURI,localname,qname,theseAttributes);
 		theWriter = writer;
@@ -49,7 +49,7 @@
 	
 	/** Flush the data to the underlying output stream */
 	public void flush()
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -58,21 +58,21 @@
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception: "+e.getMessage(),e);
+			throw new LCFException("IO exception: "+e.getMessage(),e);
 		}
 	}
 	
 	/** This method is meant to be extended by classes that extend this class */
 	protected void tagContents(char[] ch, int start, int length)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -80,15 +80,15 @@
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception: "+e.getMessage(),e);
+			throw new LCFException("IO exception: "+e.getMessage(),e);
 		}
 	}
 
@@ -96,7 +96,7 @@
 	* The XMLWriterContext accepts all subtags in their text form.
 	*/
 	protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// First, write out the tag text.  We strip off the namespace.
 		try
@@ -117,15 +117,15 @@
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception: "+e.getMessage(),e);
+			throw new LCFException("IO exception: "+e.getMessage(),e);
 		}
 		// Now, start a new context which is also a writer context.
 		super.beginTag(namespaceURI,localName,qName,atts);
@@ -136,7 +136,7 @@
 	* The XMLWriterContext accepts all subtags in their text form.
 	*/
 	protected void endTag()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// First, write out the tag text.  We strip off the namespace.
 		try
@@ -148,15 +148,15 @@
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception: "+e.getMessage(),e);
+			throw new LCFException("IO exception: "+e.getMessage(),e);
 		}
 		super.endTag();
 	}

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/incrementalingest/IncrementalIngester.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/incrementalingest/IncrementalIngester.java Wed Feb 17 15:57:27 2010
@@ -21,7 +21,7 @@
 import org.apache.lcf.core.interfaces.*;
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.agents.system.Logging;
-import org.apache.lcf.agents.system.Metacarta;
+import org.apache.lcf.agents.system.LCF;
 import java.util.*;
 
 /** Incremental ingestion API implementation.
@@ -63,7 +63,7 @@
 	/** Constructor.
 	*/
 	public IncrementalIngester(IThreadContext threadContext, IDBInterface database)
-		throws MetacartaException
+		throws LCFException
 	{
 		super(database,"ingeststatus");
 		this.threadContext = threadContext;
@@ -74,7 +74,7 @@
 	/** Install the incremental ingestion manager.
 	*/
 	public void install()
-		throws MetacartaException
+		throws LCFException
 	{
 		String outputConnectionTableName = connectionManager.getTableName();
 		String outputConnectionNameField = connectionManager.getConnectionNameColumn();
@@ -169,12 +169,12 @@
 								// Split the docID into class and doc id
 								int index = docID.indexOf(":");
 								if (index == -1)
-									throw new MetacartaException("Unexpected docID form during upgrade of ingeststatus: "+docID);
+									throw new LCFException("Unexpected docID form during upgrade of ingeststatus: "+docID);
 								String docClass = docID.substring(0,index);
 								String docIdentifier = docID.substring(index+1);
 			
 								HashMap newMap = new HashMap();
-								newMap.put(docKeyField,makeKey(docClass,Metacarta.hash(docIdentifier)));
+								newMap.put(docKeyField,makeKey(docClass,LCF.hash(docIdentifier)));
 								ArrayList newList = new ArrayList();
 								newList.add(id);
 								performUpdate(newMap,"WHERE "+idField+"=?",newList,null);
@@ -229,7 +229,7 @@
 								Long id = (Long)row.getValue(idField);
 								String docURI = (String)row.getValue(docURIField);
 								HashMap newMap = new HashMap();
-								newMap.put(uriHashField,Metacarta.hash(docURI));
+								newMap.put(uriHashField,LCF.hash(docURI));
 								ArrayList newList = new ArrayList();
 								newList.add(id);
 								performUpdate(newMap,"WHERE "+idField+"=?",newList,null);
@@ -255,7 +255,7 @@
 					}
 				}
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				signalRollback();
 				throw e;
@@ -324,7 +324,7 @@
 				{
                                         performAddIndex(null,keyIndex);
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
 					if (e.getMessage().indexOf("could not create unique index") == -1)
 						throw e;
@@ -341,7 +341,7 @@
 
 	/** Remove duplicates (as part of upgrade) */
 	protected void removeDuplicates()
-		throws MetacartaException
+		throws LCFException
 	{
 		// If we get here, it means we have to clean duplicates out of the table and try again.
 		// If there *are* duplicates for an ID, we basically don't know anything about it really, so we blindly get rid of all rows corresponding to
@@ -369,16 +369,16 @@
 	*@Return the time, in minutes.
 	*/
 	public int getAnalyzeTime()
-		throws MetacartaException
+		throws LCFException
 	{
 		// For this table, we base the wait time on the number of rows in it.
 		IResultSet set = performQuery("SELECT COUNT("+idField+") FROM "+getTableName(),null,null,null);
 		if (set.getRowCount() < 1)
-			throw new MetacartaException("Expected result with one row");
+			throw new LCFException("Expected result with one row");
 		IResultRow row = set.getRow(0);
 		Iterator columnNames = row.getColumns();
 		if (!columnNames.hasNext())
-			throw new MetacartaException("Expected result with one column");
+			throw new LCFException("Expected result with one column");
 		String columnName = (String)columnNames.next();
 		long value = new Long(row.getValue(columnName).toString()).longValue();
 		if (value < 10000L)
@@ -393,7 +393,7 @@
 	/** Analyze database tables.
 	*/
 	public void analyzeTables()
-		throws MetacartaException
+		throws LCFException
 	{
 		analyzeTable();
 	}
@@ -401,7 +401,7 @@
 	/** Uninstall the incremental ingestion manager.
 	*/
 	public void deinstall()
-		throws MetacartaException
+		throws LCFException
 	{
 		performDrop(null);
 	}
@@ -409,7 +409,7 @@
 	/** Flush all knowledge of what was ingested before.
 	*/
 	public void clearAll()
-		throws MetacartaException
+		throws LCFException
 	{
 		performDelete("",null,null);
 	}
@@ -428,7 +428,7 @@
                 String identifierClass, String identifierHash,
 		String documentVersion,
 		long recordTime, IOutputActivity activities)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		IOutputConnection connection = connectionManager.load(outputConnectionName);
 	    
@@ -467,7 +467,7 @@
 		RepositoryDocument data,
 		long ingestTime, String documentURI,
 		IOutputActivity activities)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		IOutputConnection connection = connectionManager.load(outputConnectionName);
 	    
@@ -489,14 +489,14 @@
 		RepositoryDocument data,
 		long ingestTime, String documentURI,
 		IOutputActivity activities)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	    // No transactions; not safe because post may take too much time
 
 	    // First, calculate a document uri hash value
 	    String documentURIHash = null;
 	    if (documentURI != null)
-		documentURIHash = Metacarta.hash(documentURI);
+		documentURIHash = LCF.hash(documentURI);
 
 	    // See what uri was used before for this doc, if any
 	    ArrayList list = new ArrayList();
@@ -607,7 +607,7 @@
 	public void documentCheckMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes,
 		long checkTime)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -675,7 +675,7 @@
 			if (j > 0)
 				updateRowIds(list,sb.toString(),checkTime);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -701,7 +701,7 @@
 	public void documentCheck(String outputConnectionName,
 		String identifierClass, String identifierHash,
 		long checkTime)
-		throws MetacartaException
+		throws LCFException
 	{
 		documentCheckMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash},checkTime);
 	}
@@ -709,7 +709,7 @@
 	/** Update a chunk of row ids.
 	*/
 	protected void updateRowIds(ArrayList list, String queryPart, long checkTime)
-		throws MetacartaException
+		throws LCFException
 	{
 		HashMap map = new HashMap();
 		map.put(lastIngestField,new Long(checkTime));
@@ -725,7 +725,7 @@
 	public void documentDeleteMultiple(String[] outputConnectionNames,
 		String[] identifierClasses, String[] identifierHashes,
 		IOutputRemoveActivity activities)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// Segregate request by connection names
 		HashMap keyMap = new HashMap();
@@ -772,7 +772,7 @@
 	public void documentDeleteMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes,
 		IOutputRemoveActivity activities)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		IOutputConnection connection = connectionManager.load(outputConnectionName);
 	    
@@ -852,7 +852,7 @@
 				while (j < validURIArray.length)
 				{
 					String docDBString = validURIArray[j++];
-					String docDBHashString = Metacarta.hash(docDBString);
+					String docDBHashString = LCF.hash(docDBString);
 					docURIValues.put(docDBString,docDBString);
 					docURIHashValues.put(docDBHashString,docDBHashString);
 				}
@@ -972,7 +972,7 @@
 					deleteRowIds(list,sb.toString());
 
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				signalRollback();
 				throw e;
@@ -998,7 +998,7 @@
 	*/
 	protected void findRowIdsForURIs(String outputConnectionName, HashMap rowIDSet, HashMap uris, ArrayList hashParamValues,
 		String paramList)
-		throws MetacartaException
+		throws LCFException
 	{
 		hashParamValues.add(outputConnectionName);
 		IResultSet set = performQuery("SELECT "+idField+","+docURIField+" FROM "+
@@ -1024,7 +1024,7 @@
 	*/
 	protected void findRowIdsForDocIds(String outputConnectionName, HashMap rowIDSet, ArrayList paramValues,
 		String paramList)
-		throws MetacartaException
+		throws LCFException
 	{
 		paramValues.add(outputConnectionName);
 		IResultSet set = performQuery("SELECT "+idField+" FROM "+
@@ -1041,7 +1041,7 @@
 	/** Delete a chunk of row ids.
 	*/
 	protected void deleteRowIds(ArrayList list, String queryPart)
-		throws MetacartaException
+		throws LCFException
 	{
 		performDelete("WHERE "+idField+" IN ("+queryPart+")",list,null);
 	}
@@ -1055,7 +1055,7 @@
 	public void documentDelete(String outputConnectionName,
 		String identifierClass, String identifierHash,
 		IOutputRemoveActivity activities)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		documentDeleteMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash},activities);
 	}
@@ -1066,7 +1066,7 @@
 	* that don't exist in the index.
 	*/
 	protected DeleteInfo[] getDocumentURIMultiple(String outputConnectionName, String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException
+		throws LCFException
 	{
 		DeleteInfo[] rval = new DeleteInfo[identifierHashes.length];
 		HashMap map = new HashMap();
@@ -1105,7 +1105,7 @@
 				getDocumentURIChunk(rval,map,outputConnectionName,sb.toString(),list);
 			return rval;				
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -1130,7 +1130,7 @@
 	*/
 	public DocumentIngestStatus[] getDocumentIngestDataMultiple(String[] outputConnectionNames,
 		String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Segregate request by connection names
 		HashMap keyMap = new HashMap();
@@ -1186,7 +1186,7 @@
 	*/
 	public DocumentIngestStatus[] getDocumentIngestDataMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Build the return array
 		DocumentIngestStatus[] rval = new DocumentIngestStatus[identifierHashes.length];
@@ -1228,7 +1228,7 @@
 				getDocumentIngestDataChunk(rval,indexMap,outputConnectionName,sb.toString(),list);
 			return rval;				
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -1252,7 +1252,7 @@
 	*/
 	public DocumentIngestStatus getDocumentIngestData(String outputConnectionName,
 		String identifierClass, String identifierHash)
-		throws MetacartaException
+		throws LCFException
 	{
 		return getDocumentIngestDataMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash})[0];
 	}
@@ -1266,7 +1266,7 @@
 	*/
 	public long getDocumentUpdateInterval(String outputConnectionName,
 		String identifierClass, String identifierHash)
-		throws MetacartaException
+		throws LCFException
 	{
 		return getDocumentUpdateIntervalMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash})[0];
 	}
@@ -1280,7 +1280,7 @@
 	*/
 	public long[] getDocumentUpdateIntervalMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Do these all at once!!
 		// First, create a return array
@@ -1339,7 +1339,7 @@
 	*@param returnMap is a mapping from document id to rval index.
 	*/
 	protected void getIntervals(long[] rval, String outputConnectionName, ArrayList list, String queryPart, HashMap returnMap)
-		throws MetacartaException
+		throws LCFException
 	{
 		list.add(outputConnectionName);
 		IResultSet set = performQuery("SELECT "+docKeyField+","+changeCountField+","+firstIngestField+","+lastIngestField+
@@ -1375,7 +1375,7 @@
 		String docKey, String documentVersion,
 		String outputVersion, String authorityNameString,
 		long ingestTime, String documentURI, String documentURIHash)
-		throws MetacartaException
+		throws LCFException
 	{
 		while (true)
 		{
@@ -1425,11 +1425,11 @@
 				conditionallyAnalyzeInsert();
 				return;
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				signalRollback();
 				// If this is simply a constraint violation, we just want to fall through and try the update!
-				if (e.getErrorCode() != MetacartaException.DATABASE_TRANSACTION_ABORT)
+				if (e.getErrorCode() != LCFException.DATABASE_TRANSACTION_ABORT)
 					throw e;
 				// Otherwise, exit transaction and fall through to 'update' attempt
 			}
@@ -1486,7 +1486,7 @@
 
 				// Update failed to find a matching record, so cycle back to retry the insert
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				signalRollback();
 				throw e;
@@ -1510,7 +1510,7 @@
 	*@param list is the parameter list for the query.
 	*/
 	protected void getDocumentURIChunk(DeleteInfo[] rval, Map map, String outputConnectionName, String clause, ArrayList list)
-		throws MetacartaException
+		throws LCFException
 	{
 		list.add(outputConnectionName);
 		IResultSet set = performQuery("SELECT "+docKeyField+","+docURIField+","+lastOutputVersionField+" FROM "+getTableName()+" WHERE "+
@@ -1540,7 +1540,7 @@
 	*@param list is the parameter list for the query.
 	*/
 	protected void getDocumentIngestDataChunk(DocumentIngestStatus[] rval, Map map, String outputConnectionName, String clause, ArrayList list)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Get the primary records associated with this hash value
 		list.add(outputConnectionName);
@@ -1570,7 +1570,7 @@
 	/** Add or replace document, using the specified output connection, via the standard pool.
 	*/
 	protected int addOrReplaceDocument(IOutputConnection connection, String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
 	{
 		IOutputConnector connector = OutputConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
 		if (connector == null)
@@ -1589,7 +1589,7 @@
 	/** Remove document, using the specified output connection, via the standard pool.
 	*/
 	protected void removeDocument(IOutputConnection connection, String documentURI, String outputDescription, IOutputRemoveActivity activities)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
 	{
 		IOutputConnector connector = OutputConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
 		if (connector == null)
@@ -1614,7 +1614,7 @@
 	/** Conditionally do analyze operation.
 	*/
 	protected void conditionallyAnalyzeInsert()
-		throws MetacartaException
+		throws LCFException
 	{
 		synchronized (tracker)
 		{

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentFactory.java Wed Feb 17 15:57:27 2010
@@ -39,7 +39,7 @@
 	*@return the agent.
 	*/
 	public static IAgent make(IThreadContext tc, String className)
-		throws MetacartaException
+		throws LCFException
 	{
 	    String agentName = agentIdentifier+className;
 	    Object o = tc.get(agentName);
@@ -56,7 +56,7 @@
 			arguments[0] = tc;
 			o = c.newInstance(arguments);
 			if (!(o instanceof IAgent))
-				throw new MetacartaException("Class '"+className+"' does not implement IAgent.");
+				throw new LCFException("Class '"+className+"' does not implement IAgent.");
 			tc.save(agentName,o);
 		}
 		catch (InvocationTargetException e)
@@ -65,42 +65,42 @@
 			if (z instanceof Error)
 				throw (Error)z;
 			else
-				throw (MetacartaException)z;
+				throw (LCFException)z;
 		}
 		catch (ClassNotFoundException e)
 		{
-			throw new MetacartaException("No class implementing IAgent called '"+
+			throw new LCFException("No class implementing IAgent called '"+
 				className+"'.",
 				e);
 		}
 		catch (NoSuchMethodException e)
 		{
-			throw new MetacartaException("No appropriate constructor for IAgent implementation '"+
+			throw new LCFException("No appropriate constructor for IAgent implementation '"+
 				className+"'.  Need xxx(ConfigParams).",
 				e);
 		}
 		catch (SecurityException e)
 		{
-			throw new MetacartaException("Protected constructor for IAgent implementation '"+className+"'",
+			throw new LCFException("Protected constructor for IAgent implementation '"+className+"'",
 				e);
 		}
 		catch (IllegalAccessException e)
 		{
-			throw new MetacartaException("Unavailable constructor for IAgent implementation '"+className+"'",
+			throw new LCFException("Unavailable constructor for IAgent implementation '"+className+"'",
 				e);
 		}
 		catch (IllegalArgumentException e)
 		{
-			throw new MetacartaException("Shouldn't happen!!!",e);
+			throw new LCFException("Shouldn't happen!!!",e);
 		}
 		catch (InstantiationException e)
 		{
-			throw new MetacartaException("InstantiationException for IAgent implementation '"+className+"'",
+			throw new LCFException("InstantiationException for IAgent implementation '"+className+"'",
 				e);
 		}
 		catch (ExceptionInInitializerError e)
 		{
-			throw new MetacartaException("ExceptionInInitializerError for IAgent implementation '"+className+"'",
+			throw new LCFException("ExceptionInInitializerError for IAgent implementation '"+className+"'",
 				e);
 		}
 	    }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/AgentManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -38,15 +38,15 @@
 	*@return the manager.
 	*/
 	public static IAgentManager make(IThreadContext threadContext)
-		throws MetacartaException
+		throws LCFException
 	{
 		Object o = threadContext.get(agentManager);
 		if (o == null || !(o instanceof IAgentManager))
 		{
 			IDBInterface database = DBInterfaceFactory.make(threadContext,
-				Metacarta.getMasterDatabaseName(),
-				Metacarta.getMasterDatabaseUsername(),
-				Metacarta.getMasterDatabasePassword());
+				LCF.getMasterDatabaseName(),
+				LCF.getMasterDatabaseUsername(),
+				LCF.getMasterDatabasePassword());
 
 			o = new org.apache.lcf.agents.agentmanager.AgentManager(threadContext,database);
 			threadContext.save(agentManager,o);
@@ -60,7 +60,7 @@
 	*@return true if the connection is in use, false otherwise.
 	*/
 	public static boolean isOutputConnectionInUse(IThreadContext threadContext, String connName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Instantiate the list of IAgent objects
 		IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -79,7 +79,7 @@
 	*@param connectionNames is the set of connection names.
 	*/
 	public static void noteOutputConnectorDeregistration(IThreadContext threadContext, String[] connectionNames)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Instantiate the list of IAgent objects
 		IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -97,7 +97,7 @@
 	*@param connectionNames is the set of connection names.
 	*/
 	public static void noteOutputConnectorRegistration(IThreadContext threadContext, String[] connectionNames)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Instantiate the list of IAgent objects
 		IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -113,7 +113,7 @@
 	*@return the array of such objects.
 	*/
 	public static IAgent[] instantiateAllAgents(IThreadContext threadContext)
-		throws MetacartaException
+		throws LCFException
 	{
 		IAgentManager manager = make(threadContext);
 		String[] allAgents = manager.getAllAgents();

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgent.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgent.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgent.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgent.java Wed Feb 17 15:57:27 2010
@@ -24,7 +24,7 @@
 * start-up time; they run independently until the JVM is shut down.
 * All agent classes are expected to support the following constructor:
 *
-* xxx(IThreadContext tc) throws MetacartaException
+* xxx(IThreadContext tc) throws LCFException
 *
 */
 public interface IAgent
@@ -34,41 +34,41 @@
 	/** Install agent.  This usually installs the agent's database tables etc.
 	*/
 	public void install()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Uninstall agent.  This must clean up everything the agent is responsible for.
 	*/
 	public void deinstall()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Start the agent.  This method should spin up the agent threads, and
 	* then return.
 	*/
 	public void startAgent()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Stop the agent.  This should shut down the agent threads.
 	*/
 	public void stopAgent()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Request permission from agent to delete an output connection.
 	*@param connName is the name of the output connection.
 	*@return true if the connection is in use, false otherwise.
 	*/
 	public boolean isOutputConnectionInUse(String connName)
-		throws MetacartaException;
+		throws LCFException;
 		
 	/** Note the deregistration of a set of output connections.
 	*@param connectionNames are the names of the connections being deregistered.
 	*/
 	public void noteOutputConnectorDeregistration(String[] connectionNames)
-		throws MetacartaException;
+		throws LCFException;
 		
 	/** Note the registration of a set of output connections.
 	*@param connectionNames are the names of the connections being registered.
 	*/
 	public void noteOutputConnectorRegistration(String[] connectionNames)
-		throws MetacartaException;
+		throws LCFException;
 		
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgentManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgentManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgentManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IAgentManager.java Wed Feb 17 15:57:27 2010
@@ -29,24 +29,24 @@
 	/** Install.
 	*/
 	public void install()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Uninstall.  Also uninstalls all remaining agents.
 	*/
 	public void deinstall()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Register an agent.
 	*@param className is the class.
 	*/
 	public void registerAgent(String className)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Unregister an agent.
 	*@param className is the class to unregister.
 	*/
 	public void unregisterAgent(String className)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Remove an agent.
 	* Use this when the agent cannot be invoked.  The agent becomes unavailable,
@@ -54,12 +54,12 @@
 	*@param className is the class to remove.
 	*/
 	public void removeAgent(String className)
-		throws MetacartaException;
+		throws LCFException;
 		
 	/** Get a list of all registered agent class names.
 	*@return the classnames in an array.
 	*/
 	public String[] getAllAgents()
-		throws MetacartaException;
+		throws LCFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIncrementalIngester.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIncrementalIngester.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIncrementalIngester.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIncrementalIngester.java Wed Feb 17 15:57:27 2010
@@ -45,28 +45,28 @@
 	/** Install the incremental ingestion manager.
 	*/
 	public void install()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Uninstall the incremental ingestion manager.
 	*/
 	public void deinstall()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Come up with a maximum time (in minutes) for re-analyzing tables.
 	*@Return the time, in minutes.
 	*/
 	public int getAnalyzeTime()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Analyze database tables.
 	*/
 	public void analyzeTables()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Flush all knowledge of what was ingested before.
 	*/
 	public void clearAll()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Record a document version, but don't ingest it.
 	* The purpose of this method is to keep track of the frequency at which ingestion "attempts" take place.
@@ -82,7 +82,7 @@
                 String identifierClass, String identifierHash,
 		String documentVersion, long recordTime,
 		IOutputActivity activities)
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 
 	/** Ingest a document.
 	* This ingests the document, and notes it.  If this is a repeat ingestion of the document, this
@@ -109,7 +109,7 @@
 		RepositoryDocument data,
 		long ingestTime, String documentURI,
 		IOutputActivity activities)
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 
 	/** Note the fact that we checked a document (and found that it did not need to be ingested, because the
 	* versions agreed).
@@ -121,7 +121,7 @@
 	public void documentCheckMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes,
 		long checkTime)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Note the fact that we checked a document (and found that it did not need to be ingested, because the
 	* versions agreed).
@@ -133,7 +133,7 @@
 	public void documentCheck(String outputConnectionName,
 		String identifierClass, String identifierHash,
 		long checkTime)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Delete multiple documents from the search engine index.
 	*@param outputConnectionNames are the names of the output connections associated with this action.
@@ -144,7 +144,7 @@
 	public void documentDeleteMultiple(String[] outputConnectionNames,
 		String[] identifierClasses, String[] identifierHashes,
 		IOutputRemoveActivity activities)
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 
 	/** Delete multiple documents from the search engine index.
 	*@param outputConnectionName is the name of the output connection associated with this action.
@@ -155,7 +155,7 @@
 	public void documentDeleteMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes,
 		IOutputRemoveActivity activities)
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 
 	/** Delete a document from the search engine index.
 	*@param outputConnectionName is the name of the output connection associated with this action.
@@ -166,7 +166,7 @@
 	public void documentDelete(String outputConnectionName,
 		String identifierClass, String identifierHash,
 		IOutputRemoveActivity activities)
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 
 	/** Look up ingestion data for a SET of documents.
 	*@param outputConnectionNames are the names of the output connections associated with this action.
@@ -177,7 +177,7 @@
 	*/
 	public DocumentIngestStatus[] getDocumentIngestDataMultiple(String[] outputConnectionNames,
 		String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Look up ingestion data for a SET of documents.
 	*@param outputConnectionName is the names of the output connection associated with this action.
@@ -188,7 +188,7 @@
 	*/
 	public DocumentIngestStatus[] getDocumentIngestDataMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Look up ingestion data for a documents.
 	*@param outputConnectionName is the name of the output connection associated with this action.
@@ -198,7 +198,7 @@
 	*/
 	public DocumentIngestStatus getDocumentIngestData(String outputConnectionName,
 		String identifierClass, String identifierHash)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Calculate the average time interval between changes for a document.
 	* This is based on the data gathered for the document.
@@ -209,7 +209,7 @@
 	*/
 	public long[] getDocumentUpdateIntervalMultiple(String outputConnectionName,
 		String[] identifierClasses, String[] identifierHashes)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Calculate the average time interval between changes for a document.
 	* This is based on the data gathered for the document.
@@ -220,7 +220,7 @@
 	*/
 	public long getDocumentUpdateInterval(String outputConnectionName,
 		String identifierClass, String identifierHash)
-		throws MetacartaException;
+		throws LCFException;
 
 
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIngestLogger.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIngestLogger.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIngestLogger.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IIngestLogger.java Wed Feb 17 15:57:27 2010
@@ -40,7 +40,7 @@
 	*/
 	public void recordIngestionAttempt(String documentIdentifier, Long startTime, Long dataSize,
 		String entityIdentifier, String resultCode, String resultDescription)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Record time-stamped information about a deletion attempt.
 	*@param documentIdentifier is the internal document identifier being described.
@@ -55,6 +55,6 @@
 	*/
 	public void recordDeletionAttempt(String documentIdentifier, Long startTime,
 		String entityIdentifier, String resultCode, String resultDescription)
-		throws MetacartaException;
+		throws LCFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputAddActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputAddActivity.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputAddActivity.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputAddActivity.java Wed Feb 17 15:57:27 2010
@@ -35,6 +35,6 @@
         *@return the properly qualified access token.
         */
         public String qualifyAccessToken(String authorityNameString, String accessToken)
-                throws MetacartaException;
+                throws LCFException;
     
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectionManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectionManager.java Wed Feb 17 15:57:27 2010
@@ -29,33 +29,33 @@
         /** Install the manager.
         */
         public void install()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Uninstall the manager.
         */
         public void deinstall()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Export configuration */
         public void exportConfiguration(java.io.OutputStream os)
-                throws java.io.IOException, MetacartaException;
+                throws java.io.IOException, LCFException;
         
         /** Import configuration */
         public void importConfiguration(java.io.InputStream is)
-                throws java.io.IOException, MetacartaException;
+                throws java.io.IOException, LCFException;
         
         /** Obtain a list of the output connections, ordered by name.
         *@return an array of connection objects.
         */
         public IOutputConnection[] getAllConnections()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Load an output connection by name.
         *@param name is the name of the output connection.
         *@return the loaded connection object, or null if not found.
         */
         public IOutputConnection load(String name)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Load a set of output connections.
         *@param names are the names of the output connections.
@@ -63,40 +63,40 @@
         * values for those not found.
         */
         public IOutputConnection[] loadMultiple(String[] names)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Create a new output connection object.
         *@return the new object.
         */
         public IOutputConnection create()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Save an output connection object.
         *@param object is the object to save.
         */
         public void save(IOutputConnection object)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Delete an output 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 MetacartaException;
+                throws LCFException;
 
         /** Get a list of output connections that share the same connector.
         *@param className is the class name of the connector.
         *@return the repository connections that use that connector.
         */
         public String[] findConnectionsForConnector(String className)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Check if underlying connector exists.
         *@param name is the name of the connection to check.
         *@return true if the underlying connector is registered.
         */
         public boolean checkConnectorExists(String name)
-                throws MetacartaException;
+                throws LCFException;
 
         // Schema related
 

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnector.java Wed Feb 17 15:57:27 2010
@@ -63,7 +63,7 @@
         *@param threadContext is the current thread context.
         */
         public void install(IThreadContext threadContext)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Uninstall the connector.
         * This method is called to remove persistent storage for the connector, such as database tables etc.
@@ -71,7 +71,7 @@
         *@param threadContext is the current thread context.
         */
         public void deinstall(IThreadContext threadContext)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Return the path for the UI interface JSP elements.
         * These JSP's must be provided to allow the connector to be configured, and to
@@ -100,18 +100,18 @@
         *@return the connection's status as a displayable string.
         */
         public String check()
-                throws MetacartaException;
+                throws LCFException;
 
         /** This method is periodically called for all connectors that are connected but not
         * in active use.
         */
         public void poll()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Close the connection.  Call this before discarding the repository connector.
         */
         public void disconnect()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Clear out any state information specific to a given thread.
         * This method is called when this object is returned to the connection pool.
@@ -140,7 +140,7 @@
         * the document will not need to be sent again to the output data store.
         */
         public String getOutputDescription(OutputSpecification spec)
-                throws MetacartaException;
+                throws LCFException;
                 
         /** Add (or replace) a document in the output data store using the connector.
         * This method presumes that the connector object has been configured, and it is thus able to communicate with the output data store should that be
@@ -157,7 +157,7 @@
         *@return the document status (accepted or permanently rejected).
         */
         public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
-                throws MetacartaException, ServiceInterruption;
+                throws LCFException, ServiceInterruption;
                 
         /** Remove a document using the connector.
         * Note that the last outputDescription is included, since it may be necessary for the connector to use such information to know how to properly remove the document.
@@ -167,7 +167,7 @@
         *@activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity.
         */
         public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity activities)
-                throws MetacartaException, ServiceInterruption;
+                throws LCFException, ServiceInterruption;
                 
 }
 

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectorManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputConnectorManager.java Wed Feb 17 15:57:27 2010
@@ -30,12 +30,12 @@
         /** Install.
         */
         public void install()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Uninstall.  This also unregisters all connectors.
         */
         public void deinstall()
-                throws MetacartaException;
+                throws LCFException;
 
         /** Register a new connector.
         * The connector's install method will also be called.
@@ -43,14 +43,14 @@
         *@param className is the class name.
         */
         public void registerConnector(String description, String className)
-                throws MetacartaException;
+                throws LCFException;
 
         /** 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 MetacartaException;
+                throws LCFException;
 
         /** Remove a connector.
         * Use this method when the connector doesn't seem to be in the
@@ -58,27 +58,27 @@
         *@param className is the connector class to remove.
         */
         public void removeConnector(String className)
-                throws MetacartaException;
+                throws LCFException;
 
         /** Get ordered list of connectors.
         *@return a resultset with the columns "description" and "classname".
         * These will be ordered by description.
         */
         public IResultSet getConnectors()
-                throws MetacartaException;
+                throws LCFException;
 
         /** 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 MetacartaException;
+                throws LCFException;
 
         /** 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 MetacartaException;
+                throws LCFException;
                 
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputHistoryActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputHistoryActivity.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputHistoryActivity.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IOutputHistoryActivity.java Wed Feb 17 15:57:27 2010
@@ -44,6 +44,6 @@
         */
         public void recordActivity(Long startTime, String activityType, Long dataSize,
                 String entityURI, String resultCode, String resultDescription)
-                throws MetacartaException;
+                throws LCFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IncrementalIngesterFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IncrementalIngesterFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IncrementalIngesterFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/IncrementalIngesterFactory.java Wed Feb 17 15:57:27 2010
@@ -37,15 +37,15 @@
 	/** Get an appropriate incremental ingest manager handle.
 	*/
 	public static IIncrementalIngester make(IThreadContext threadContext)
-		throws MetacartaException
+		throws LCFException
 	{
 		Object o = threadContext.get(ingestManager);
 		if (o == null || !(o instanceof IIncrementalIngester))
 		{
 			IDBInterface database = DBInterfaceFactory.make(threadContext,
-				Metacarta.getMasterDatabaseName(),
-				Metacarta.getMasterDatabaseUsername(),
-				Metacarta.getMasterDatabasePassword());
+				LCF.getMasterDatabaseName(),
+				LCF.getMasterDatabaseUsername(),
+				LCF.getMasterDatabasePassword());
 
 			o = new org.apache.lcf.agents.incrementalingest.IncrementalIngester(threadContext,database);
 			threadContext.save(ingestManager,o);

Modified: incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/OutputConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/OutputConnectionManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/OutputConnectionManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/org/apache/lcf/agents/interfaces/OutputConnectionManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -19,7 +19,7 @@
 package org.apache.lcf.agents.interfaces;
 
 import org.apache.lcf.core.interfaces.*;
-import org.apache.lcf.agents.system.Metacarta;
+import org.apache.lcf.agents.system.LCF;
 
 import java.util.*;
 
@@ -41,15 +41,15 @@
         *@return the handle.
         */
         public static IOutputConnectionManager make(IThreadContext tc)
-                throws MetacartaException
+                throws LCFException
         {
                 Object o = tc.get(objectName);
                 if (o == null || !(o instanceof IOutputConnectionManager))
                 {
                         IDBInterface database = DBInterfaceFactory.make(tc,
-                                Metacarta.getMasterDatabaseName(),
-                                Metacarta.getMasterDatabaseUsername(),
-                                Metacarta.getMasterDatabasePassword());
+                                LCF.getMasterDatabaseName(),
+                                LCF.getMasterDatabaseUsername(),
+                                LCF.getMasterDatabasePassword());
 
                         o = new org.apache.lcf.agents.outputconnection.OutputConnectionManager(tc,database);
                         tc.save(objectName,o);
@@ -62,7 +62,7 @@
         *@return the sorted list of output connection activities.
         */
         public static String[] getAllOutputActivities(IThreadContext tc)
-                throws MetacartaException
+                throws LCFException
         {
                 IOutputConnectionManager manager = make(tc);
                 IOutputConnection[] connections = manager.getAllConnections();



Mime
View raw message