manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r911029 [10/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/crawle...
Date Wed, 17 Feb 2010 15:57:35 GMT
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceMySQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceMySQL.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceMySQL.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceMySQL.java Wed Feb 17 15:57:27 2010
@@ -29,7 +29,7 @@
 	protected String cacheKey;
 
 	public DBInterfaceMySQL(IThreadContext tc, String databaseName, String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (databaseName == null)
 			databaseName = "mysql";
@@ -65,7 +65,7 @@
 	*@param tableName is the name of the table.
 	*/
 	public void performLock(String tableName)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("LOCK TABLE "+tableName+" IN EXCLUSIVE MODE",null,null);
 	}
@@ -77,7 +77,7 @@
 	*@param parameterMap is the map of column name/values to write.
 	*/
 	public void performInsert(String tableName, Map parameterMap, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList paramArray = new ArrayList();
 
@@ -130,7 +130,7 @@
 	*@param whereParameters are the parameters that come with the where clause, if any.
 	*/
 	public void performUpdate(String tableName, Map parameterMap, String whereClause, ArrayList whereParameters, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList paramArray = new ArrayList();
 
@@ -195,7 +195,7 @@
 	*@param whereParameters are the parameters that come with the where clause, if any.
 	*/
 	public void performDelete(String tableName, String whereClause, ArrayList whereParameters, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringBuffer bf = new StringBuffer();
 		bf.append("DELETE FROM ");
@@ -221,7 +221,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performCreate(String tableName, Map columnMap, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringBuffer queryBuffer = new StringBuffer("CREATE TABLE ");
 		queryBuffer.append(tableName);
@@ -276,7 +276,7 @@
 	*/
 	public void performAlter(String tableName, Map columnMap, Map columnModifyMap, ArrayList columnDeleteList,
 		StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		// MHL
 	}
@@ -288,7 +288,7 @@
 	* in the index, in order.
 	*/
 	public void addTableIndex(String tableName, boolean unique, ArrayList columnList)
-		throws MetacartaException
+		throws LCFException
 	{
 		String[] columns = new String[columnList.size()];
 		int i = 0;
@@ -306,7 +306,7 @@
 	*@param description is the index description.
 	*/
 	public void performAddIndex(String indexName, String tableName, IndexDescription description)
-		throws MetacartaException
+		throws LCFException
 	{
 		String[] columnNames = description.getColumnNames();
 		if (columnNames.length == 0)
@@ -341,7 +341,7 @@
 	*@param indexName is the name of the index to remove.
 	*/
 	public void performRemoveIndex(String indexName)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP INDEX "+indexName,null,null);
 	}
@@ -350,7 +350,7 @@
 	*@param tableName is the name of the table to analyze/calculate statistics for.
 	*/
 	public void analyzeTable(String tableName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Does nothing
 	}
@@ -359,7 +359,7 @@
 	*@param tableName is the name of the table to rebuild indexes for.
 	*/
 	public void reindexTable(String tableName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Does nothing
 	}
@@ -369,7 +369,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performDrop(String tableName, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP TABLE "+tableName,null,invalidateKeys);
 	}
@@ -379,9 +379,9 @@
 	*@return true if the user exists.
 	*/
 	public boolean lookupUser(String userName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
-		throw new MetacartaException("Not Supported");
+		throw new LCFException("Not Supported");
 	}
 
 	/** Perform user create.
@@ -389,7 +389,7 @@
 	*@param password is the user's password.
 	*/
 	public void performCreateUser(String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Does nothing for MySQL
 	}
@@ -398,7 +398,7 @@
 	*@param userName is the user name.
 	*/
 	public void performDropUser(String userName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Does nothing
 	}
@@ -409,9 +409,9 @@
 	*@return true if the database exists.
 	*/
 	public boolean lookupDatabase(String databaseName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
-		throw new MetacartaException("Not Supported");
+		throw new LCFException("Not Supported");
 	}
 
 
@@ -423,7 +423,7 @@
 	*/
 	public void performCreateDatabase(String databaseName, String databaseUser, String databasePassword,
 		StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction();
 		try
@@ -438,7 +438,7 @@
 				quoteSQLString(databasePassword),null,invalidateKeys);
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -459,7 +459,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performDropDatabase(String databaseName, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP DATABASE "+databaseName,null,invalidateKeys);
 	}
@@ -470,7 +470,7 @@
 	*@param invalidateKeys are the cache keys to invalidate.
 	*/
 	public void performModification(String query, ArrayList params, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		database.executeQuery(query,params,null,invalidateKeys,null,false,0,null,null);
 	}
@@ -482,7 +482,7 @@
 	*@return a map of column names and ColumnDescription objects, describing the schema.
 	*/
 	public Map getTableSchema(String tableName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("DESCRIBE "+tableName,null,cacheKeys,queryClass);
 		// Digest the result
@@ -508,7 +508,7 @@
 	*@return a map of index names and IndexDescription objects, describing the indexes.
 	*/
 	public Map getTableIndexes(String tableName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		// MHL
 		return null;
@@ -520,7 +520,7 @@
 	*@return the set of tables.
 	*/
 	public StringSet getAllTables(StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("SHOW TABLES",null,cacheKeys,queryClass);
 		StringSetBuffer ssb = new StringSetBuffer();
@@ -549,7 +549,7 @@
 	*@return a resultset.
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		return database.executeQuery(query,params,cacheKeys,null,queryClass,true,-1,null,null);
 	}
@@ -566,7 +566,7 @@
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
 		int maxResults, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 		return database.executeQuery(query,params,cacheKeys,null,queryClass,true,maxResults,null,returnLimit);
 	}
@@ -584,7 +584,7 @@
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
 		int maxResults, ResultSpecification resultSpec, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 		return database.executeQuery(query,params,cacheKeys,null,queryClass,true,maxResults,resultSpec,returnLimit);
 	}
@@ -643,7 +643,7 @@
 	* signalRollback() method, and rethrow the exception.  Then, after that a finally{} block which calls endTransaction().
 	*/
 	public void beginTransaction()
-		throws MetacartaException
+		throws LCFException
 	{
 		database.beginTransaction(database.TRANSACTION_READCOMMITTED);
 	}
@@ -658,7 +658,7 @@
 	*@param transactionType is the kind of transaction desired.
 	*/
 	public void beginTransaction(int transactionType)
-		throws MetacartaException
+		throws LCFException
 	{
 		database.beginTransaction(database.TRANSACTION_READCOMMITTED);
 	}
@@ -674,7 +674,7 @@
 	* signalRollback() was called within the transaction).
 	*/
 	public void endTransaction()
-		throws MetacartaException
+		throws LCFException
 	{
 		database.endTransaction();
 	}

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfacePostgreSQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfacePostgreSQL.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfacePostgreSQL.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfacePostgreSQL.java Wed Feb 17 15:57:27 2010
@@ -39,7 +39,7 @@
 	protected ArrayList tablesToReindex = new ArrayList();
 
 	public DBInterfacePostgreSQL(IThreadContext tc, String databaseName, String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (databaseName == null)
 			databaseName = "template1";
@@ -75,7 +75,7 @@
 	*@param tableName is the name of the table.
 	*/
 	public void performLock(String tableName)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("LOCK TABLE "+tableName+" IN EXCLUSIVE MODE",null,null);
 	}
@@ -87,7 +87,7 @@
 	*@param parameterMap is the map of column name/values to write.
 	*/
 	public void performInsert(String tableName, Map parameterMap, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList paramArray = new ArrayList();
 
@@ -140,7 +140,7 @@
 	*@param whereParameters are the parameters that come with the where clause, if any.
 	*/
 	public void performUpdate(String tableName, Map parameterMap, String whereClause, ArrayList whereParameters, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList paramArray = new ArrayList();
 
@@ -205,7 +205,7 @@
 	*@param whereParameters are the parameters that come with the where clause, if any.
 	*/
 	public void performDelete(String tableName, String whereClause, ArrayList whereParameters, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringBuffer bf = new StringBuffer();
 		bf.append("DELETE FROM ");
@@ -231,7 +231,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performCreate(String tableName, Map columnMap, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringBuffer queryBuffer = new StringBuffer("CREATE TABLE ");
 		queryBuffer.append(tableName);
@@ -291,7 +291,7 @@
 	*/
 	public void performAlter(String tableName, Map columnMap, Map columnModifyMap, ArrayList columnDeleteList,
 		StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction(TRANSACTION_ENCLOSING);
 		try
@@ -345,7 +345,7 @@
 				}
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			signalRollback();
 			throw e;
@@ -383,7 +383,7 @@
 	* in the index, in order.
 	*/
 	public void addTableIndex(String tableName, boolean unique, ArrayList columnList)
-		throws MetacartaException
+		throws LCFException
 	{
 		String[] columns = new String[columnList.size()];
 		int i = 0;
@@ -401,7 +401,7 @@
 	*@param description is the index description.
 	*/
 	public void performAddIndex(String indexName, String tableName, IndexDescription description)
-		throws MetacartaException
+		throws LCFException
 	{
 		String[] columnNames = description.getColumnNames();
 		if (columnNames.length == 0)
@@ -436,7 +436,7 @@
 	*@param indexName is the name of the index to remove.
 	*/
 	public void performRemoveIndex(String indexName)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP INDEX "+indexName,null,null);
 	}
@@ -445,7 +445,7 @@
 	*@param tableName is the name of the table to analyze/calculate statistics for.
 	*/
 	public void analyzeTable(String tableName)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (getTransactionID() == null)
 			performModification("ANALYZE "+tableName,null,null);
@@ -457,7 +457,7 @@
 	*@param tableName is the name of the table to rebuild indexes for.
 	*/
 	public void reindexTable(String tableName)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (getTransactionID() == null)
 			performModification("REINDEX TABLE "+tableName,null,null);
@@ -470,7 +470,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performDrop(String tableName, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP TABLE "+tableName,null,invalidateKeys);
 	}
@@ -480,7 +480,7 @@
 	*@return true if the user exists.
 	*/
 	public boolean lookupUser(String userName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList params = new ArrayList();
 		params.add(userName);
@@ -495,7 +495,7 @@
 	*@param password is the user's password.
 	*/
 	public void performCreateUser(String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("CREATE USER "+userName+" PASSWORD "+
 			quoteSQLString(password),null,null);
@@ -505,7 +505,7 @@
 	*@param userName is the user name.
 	*/
 	public void performDropUser(String userName)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP USER "+userName,null,null);
 	}
@@ -516,7 +516,7 @@
 	*@return true if the database exists.
 	*/
 	public boolean lookupDatabase(String databaseName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		ArrayList params = new ArrayList();
 		params.add(databaseName);
@@ -534,7 +534,7 @@
 	*/
 	public void performCreateDatabase(String databaseName, String databaseUser, String databasePassword,
 		StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("CREATE DATABASE "+databaseName+" OWNER="+
 			databaseUser+" ENCODING="+
@@ -546,7 +546,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performDropDatabase(String databaseName, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		performModification("DROP DATABASE "+databaseName,null,invalidateKeys);
 	}
@@ -556,11 +556,11 @@
 	*@param theException is the exception to reinterpret
 	*@return the reinterpreted exception to throw.
 	*/
-	protected MetacartaException reinterpretException(MetacartaException theException)
+	protected LCFException reinterpretException(LCFException theException)
 	{
 		if (Logging.db.isDebugEnabled())
 			Logging.db.debug("Reinterpreting exception '"+theException.getMessage()+"'.  The exception type is "+Integer.toString(theException.getErrorCode()));
-		if (theException.getErrorCode() != MetacartaException.DATABASE_CONNECTION_ERROR)
+		if (theException.getErrorCode() != LCFException.DATABASE_CONNECTION_ERROR)
 			return theException;
 		Throwable e = theException.getCause();
 		if (!(e instanceof java.sql.SQLException))
@@ -569,14 +569,14 @@
 			Logging.db.debug("Exception "+theException.getMessage()+" is possibly a transaction abort signal");
 		String message = e.getMessage();
 		if (message.indexOf("deadlock detected") != -1)
-			return new MetacartaException(message,e,MetacartaException.DATABASE_TRANSACTION_ABORT);
+			return new LCFException(message,e,LCFException.DATABASE_TRANSACTION_ABORT);
 		if (message.indexOf("could not serialize") != -1)
-			return new MetacartaException(message,e,MetacartaException.DATABASE_TRANSACTION_ABORT);
+			return new LCFException(message,e,LCFException.DATABASE_TRANSACTION_ABORT);
 		// Note well: We also have to treat 'duplicate key' as a transaction abort, since this is what you get when two threads attempt to
 		// insert the same row.  (Everything only works, then, as long as there is a unique constraint corresponding to every bad insert that
 		// one could make.)
 		if (message.indexOf("duplicate key") != -1)
-			return new MetacartaException(message,e,MetacartaException.DATABASE_TRANSACTION_ABORT);
+			return new LCFException(message,e,LCFException.DATABASE_TRANSACTION_ABORT);
 		if (Logging.db.isDebugEnabled())
 			Logging.db.debug("Exception "+theException.getMessage()+" is NOT a transaction abort signal");
 		return theException;
@@ -588,13 +588,13 @@
 	*@param invalidateKeys are the cache keys to invalidate.
 	*/
 	public void performModification(String query, ArrayList params, StringSet invalidateKeys)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
 			database.executeQuery(query,params,null,invalidateKeys,null,false,0,null,null);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw reinterpretException(e);
 		}
@@ -608,7 +608,7 @@
 	* table doesn't exist.
 	*/
 	public Map getTableSchema(String tableName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		StringBuffer query = new StringBuffer();
 		query.append("SELECT pg_attribute.attname AS \"Field\",");
@@ -650,7 +650,7 @@
 	*@return a map of index names and IndexDescription objects, describing the indexes.
 	*/
 	public Map getTableIndexes(String tableName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		Map rval = new HashMap();
 
@@ -673,7 +673,7 @@
 			{
 				beforeMatch = indexdef.indexOf("CREATE INDEX ",parsePosition);
 				if (beforeMatch == -1)
-					throw new MetacartaException("Cannot parse index description: '"+indexdef+"'");
+					throw new LCFException("Cannot parse index description: '"+indexdef+"'");
 				isUnique = false;
 				parsePosition += "CREATE INDEX ".length();
 			}
@@ -685,12 +685,12 @@
 			
 			int afterMatch = indexdef.indexOf(" ON",parsePosition);
 			if (afterMatch == -1)
-				throw new MetacartaException("Cannot parse index description: '"+indexdef+"'");
+				throw new LCFException("Cannot parse index description: '"+indexdef+"'");
 			String indexName = indexdef.substring(parsePosition,afterMatch);
 			parsePosition = afterMatch + " ON".length();
 			int parenPosition = indexdef.indexOf("(",parsePosition);
 			if (parenPosition == -1)
-				throw new MetacartaException("Cannot parse index description: '"+indexdef+"'");
+				throw new LCFException("Cannot parse index description: '"+indexdef+"'");
 			parsePosition = parenPosition + 1;
 			ArrayList columns = new ArrayList();
 			while (true)
@@ -700,7 +700,7 @@
 				if (nextIndex == -1)
 					nextIndex = nextParenIndex;
 				if (nextIndex == -1)
-					throw new MetacartaException("Cannot parse index description: '"+indexdef+"'");
+					throw new LCFException("Cannot parse index description: '"+indexdef+"'");
 				if (nextParenIndex != -1 && nextParenIndex < nextIndex)
 					nextIndex = nextParenIndex;
 				
@@ -731,7 +731,7 @@
 	*@return the set of tables.
 	*/
 	public StringSet getAllTables(StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet set = performQuery("SELECT relname FROM pg_class",null,cacheKeys,queryClass);
 		StringSetBuffer ssb = new StringSetBuffer();
@@ -756,13 +756,13 @@
 	*@return a resultset.
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
 			return database.executeQuery(query,params,cacheKeys,null,queryClass,true,-1,null,null);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw reinterpretException(e);
 		}
@@ -780,13 +780,13 @@
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
 		int maxResults, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
 			return database.executeQuery(query,params,cacheKeys,null,queryClass,true,maxResults,null,returnLimit);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw reinterpretException(e);
 		}
@@ -805,13 +805,13 @@
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
 		int maxResults, ResultSpecification resultSpec, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
 			return database.executeQuery(query,params,cacheKeys,null,queryClass,true,maxResults,resultSpec,returnLimit);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw reinterpretException(e);
 		}
@@ -871,7 +871,7 @@
 	* signalRollback() method, and rethrow the exception.  Then, after that a finally{} block which calls endTransaction().
 	*/
 	public void beginTransaction()
-		throws MetacartaException
+		throws LCFException
 	{
 		beginTransaction(TRANSACTION_ENCLOSING);
 	}
@@ -886,7 +886,7 @@
 	*@param transactionType is the kind of transaction desired.
 	*/
 	public void beginTransaction(int transactionType)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (database.getCurrentTransactionType() == database.TRANSACTION_SERIALIZED)
 		{
@@ -906,7 +906,7 @@
 				transactionType = TRANSACTION_SERIALIZED;
 				break;
 			default:
-				throw new MetacartaException("Unknown transaction type");
+				throw new LCFException("Unknown transaction type");
 		        }
 		}
 		
@@ -927,7 +927,7 @@
 				database.endTransaction();
 				throw e;
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				database.signalRollback();
 				database.endTransaction();
@@ -935,7 +935,7 @@
 			}
 			break;
 		default:
-			throw new MetacartaException("Bad transaction type");
+			throw new LCFException("Bad transaction type");
 		}
 	}
 
@@ -951,7 +951,7 @@
 	* signalRollback() was called within the transaction).
 	*/
 	public void endTransaction()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (serializableDepth > 0)
 		{

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/Database.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/Database.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/Database.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/Database.java Wed Feb 17 15:57:27 2010
@@ -52,7 +52,7 @@
 	protected final static String ROLLBACK_TRANSACTION = "ROLLBACK";
 
 	public Database(IThreadContext context, String databaseName, String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		this.context = context;
 		this.databaseName = databaseName;
@@ -107,7 +107,7 @@
 	*/
 	public IResultSet executeQuery(String query, ArrayList params, StringSet cacheKeys, StringSet invalidateKeys,
 		String queryClass, boolean needResult, int maxReturn, ResultSpecification spec, ILimitChecker returnLimits)
-		throws MetacartaException
+		throws LCFException
 	{
 		// System.out.println("Query: "+query);
 		if (Logging.db.isDebugEnabled())
@@ -158,7 +158,7 @@
 	*@param transactionType describes the type of the transaction.
 	*/
 	public void beginTransaction(int transactionType)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (Logging.db.isDebugEnabled())
 			Logging.db.debug("Beginning transaction of type "+Integer.toString(transactionType));
@@ -177,7 +177,7 @@
 	/** Synchronize internal transactions.
 	*/
 	protected void synchronizeTransactions()
-		throws MetacartaException
+		throws LCFException
 	{
 		while (delayedTransactionDepth > 0)
 		{
@@ -191,7 +191,7 @@
 	/** Perform actual transaction begin.
 	*/
 	protected void internalTransactionBegin()
-		throws MetacartaException
+		throws LCFException
 	{
 		// Get a semipermanent connection
 		if (connection == null)
@@ -206,9 +206,9 @@
 			{
 				// Don't do anything else other than drop the connection on the floor
 				connection = null;
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				ConnectionFactory.releaseConnection(connection);
 				connection = null;
@@ -231,7 +231,7 @@
 			{
 				// Don't do anything else other than drop the connection on the floor
 				connection = null;
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 		}
 	}
@@ -248,11 +248,11 @@
 	* signalRollback() was called within the transaction).
 	*/
 	public void endTransaction()
-		throws MetacartaException
+		throws LCFException
 	{
 		Logging.db.debug("Ending transaction");
 		if (th == null)
-			throw new MetacartaException("End transaction without begin!",MetacartaException.GENERAL_ERROR);
+			throw new LCFException("End transaction without begin!",LCFException.GENERAL_ERROR);
 
 		TransactionHandle parentTransaction = th.getParent();
 		// If the database throws up on the commit or the rollback, above us there
@@ -284,7 +284,7 @@
 				{
 					// Drop the connection on the floor, so it cannot be reused.
 					connection = null;
-					throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 				}
 				finally
 				{
@@ -364,7 +364,7 @@
 	/** Do query execution via a subthread, so the primary thread can be interrupted */
 	protected IResultSet executeViaThread(Connection connection, String query, ArrayList params, boolean bResults, int maxResults,
 		ResultSpecification spec, ILimitChecker returnLimit)
-		throws MetacartaException, InterruptedException
+		throws LCFException, InterruptedException
 	{
 		if (connection == null)
 			// This probably means that the thread was interrupted and the connection was abandoned.  Just return null.
@@ -378,11 +378,11 @@
 			Throwable thr = t.getException();
 			if (thr != null)
 			{
-				if (thr instanceof MetacartaException)
+				if (thr instanceof LCFException)
 				{
 					// Nest the exceptions so there is a hope we actually see the context, while preserving the kind of error it is
-					MetacartaException me = (MetacartaException)thr;
-					throw new MetacartaException("Database exception: "+me.getMessage(),me.getCause(),me.getErrorCode());
+					LCFException me = (LCFException)thr;
+					throw new LCFException("Database exception: "+me.getMessage(),me.getCause(),me.getErrorCode());
 				}
 				else
 					throw (Error)thr;
@@ -403,7 +403,7 @@
 	*/
 	protected IResultSet executeUncachedQuery(String query, ArrayList params, boolean bResults, int maxResults,
 		ResultSpecification spec, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 
 		if (connection != null)
@@ -416,7 +416,7 @@
 			{
 				// drop the connection object on the floor, so it cannot possibly be reused
 				connection = null;
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 		}
 		else
@@ -431,7 +431,7 @@
 			{
 				// drop the connection object on the floor, so it cannot possibly be reused
 				tempConnection = null;
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 			finally
 			{
@@ -452,7 +452,7 @@
 	*/
 	protected IResultSet execute(Connection connection, String query, ArrayList params, boolean bResults, int maxResults,
 		ResultSpecification spec, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 		IResultSet rval = null;
 		try
@@ -541,7 +541,7 @@
 			{
 				// There are a lot of different sorts of error that can be embedded here.  Unfortunately, it's database dependent how
 				// to interpret the error.  So toss a generic error, and let the caller figure out if it needs to treat it differently.
-				throw new MetacartaException("Exception doing query: "+e.getMessage(),e,MetacartaException.DATABASE_CONNECTION_ERROR);
+				throw new LCFException("Exception doing query: "+e.getMessage(),e,LCFException.DATABASE_CONNECTION_ERROR);
 			}
 		}
 		finally
@@ -555,7 +555,7 @@
 
 	// Read data from a resultset
 	protected IResultSet getData(ResultSet rs, boolean bResults, int maxResults, ResultSpecification spec, ILimitChecker returnLimit)
-		throws MetacartaException
+		throws LCFException
 	{
 	    RSet results = new RSet();  // might be empty but not an error
 	    try
@@ -590,7 +590,7 @@
 					{
 						// This is an error situation; if a result with no columns is
 						// necessary, bResults must be false!!!
-						throw new MetacartaException("Empty query, no columns returned",MetacartaException.GENERAL_ERROR);
+						throw new LCFException("Empty query, no columns returned",LCFException.GENERAL_ERROR);
 					}
 
 					while (rs.next() && (maxResults == -1 || maxResults > 0) && (returnLimit == null || returnLimit.checkContinue()))
@@ -644,7 +644,7 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Resultset error: "+e.getMessage(),e,MetacartaException.DATABASE_CONNECTION_ERROR);
+			throw new LCFException("Resultset error: "+e.getMessage(),e,LCFException.DATABASE_CONNECTION_ERROR);
 		}
 	    }
 	    catch (Throwable e)
@@ -666,8 +666,8 @@
 					((CharacterInput)o).discard();
 			}
 		}
-		if (e instanceof MetacartaException)
-			throw (MetacartaException)e;
+		if (e instanceof LCFException)
+			throw (LCFException)e;
 		if (e instanceof RuntimeException)
 			throw (RuntimeException)e;
 		if (e instanceof Error)
@@ -679,7 +679,7 @@
 
 	// pass params to preparedStatement
 	protected static void loadPS(PreparedStatement ps, ArrayList data)
-		throws java.sql.SQLException, MetacartaException
+		throws java.sql.SQLException, LCFException
 	{
 		if (data!=null)
 		{
@@ -738,7 +738,7 @@
 	/** Clean up parameters after query has been triggered.
 	*/
 	protected static void cleanupParameters(ArrayList data)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (data != null)
 		{
@@ -760,7 +760,7 @@
 	}
 		
 	protected int findColumn(ResultSet rs, String name)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -772,12 +772,12 @@
 		}
 		catch (Exception e)
 		{
-			throw new MetacartaException("Error finding " + name + " in resultset: "+e.getMessage(),e,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error finding " + name + " in resultset: "+e.getMessage(),e,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected Blob getBLOB(ResultSet rs, int col)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -785,16 +785,16 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in getBlob",sqle,MetacartaException.DATABASE_CONNECTION_ERROR);
+			throw new LCFException("Error in getBlob",sqle,LCFException.DATABASE_CONNECTION_ERROR);
 		}
 		catch (Exception sqle)
 		{
-			throw new MetacartaException("Error in getBlob",sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in getBlob",sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected boolean isBLOB(ResultSetMetaData rsmd, int col)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -803,16 +803,16 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in isBlob("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_CONNECTION_ERROR);
+			throw new LCFException("Error in isBlob("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_CONNECTION_ERROR);
 		}
 		catch (Exception sqle)
 		{
-			throw new MetacartaException("Error in isBlob("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in isBlob("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected boolean isBinary(ResultSetMetaData rsmd, int col)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -822,16 +822,16 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in isBinary("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_CONNECTION_ERROR);
+			throw new LCFException("Error in isBinary("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_CONNECTION_ERROR);
 		}
 		catch (Exception sqle)
 		{
-			throw new MetacartaException("Error in isBinary("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in isBinary("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected Object getObject(ResultSet rs, ResultSetMetaData rsmd, int col, int desiredForm)
-		throws MetacartaException
+		throws LCFException
 	{
 		Object result = null;
 
@@ -927,7 +927,7 @@
 						break;
 
 					case java.sql.Types.BLOB:
-						throw new MetacartaException("BLOB is not a string, column = " + col,MetacartaException.GENERAL_ERROR);
+						throw new LCFException("BLOB is not a string, column = " + col,LCFException.GENERAL_ERROR);
 
 					default :
 						switch (desiredForm)
@@ -940,7 +940,7 @@
 							result = new TempFileCharacterInput(rs.getCharacterStream(col));
 							break;
 						default:
-							throw new MetacartaException("Illegal form requested for column "+Integer.toString(col)+": "+Integer.toString(desiredForm));
+							throw new LCFException("Illegal form requested for column "+Integer.toString(col)+": "+Integer.toString(desiredForm));
 						}
 						break;
 					}
@@ -954,7 +954,7 @@
 			}
 			catch (java.sql.SQLException e)
 			{
-				throw new MetacartaException("Exception in getObject(): "+e.getMessage(),e,MetacartaException.DATABASE_CONNECTION_ERROR);
+				throw new LCFException("Exception in getObject(): "+e.getMessage(),e,LCFException.DATABASE_CONNECTION_ERROR);
 			}
 		}
 		catch (Throwable e)
@@ -963,8 +963,8 @@
 				((CharacterInput)result).discard();
 			else if (result instanceof BinaryInput)
 				((BinaryInput)result).discard();
-			if (e instanceof MetacartaException)
-				throw (MetacartaException)e;
+			if (e instanceof LCFException)
+				throw (LCFException)e;
 			if (e instanceof RuntimeException)
 				throw (RuntimeException)e;
 			if (e instanceof Error)
@@ -1011,7 +1011,7 @@
 	* @param objectDescriptions are the unique identifiers of the objects.
 	* @return the newly created objects to cache, or null, if any object cannot be created.
 	*/
-	public Object[] create(ICacheDescription[] objectDescriptions) throws MetacartaException
+	public Object[] create(ICacheDescription[] objectDescriptions) throws LCFException
 	{
 		// Perform the requested query, within the appropriate transaction object.
 		// Call the database object to do this
@@ -1062,7 +1062,7 @@
 					}
 					Logging.db.warn("");
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
 					Logging.db.error("Explain failed with error "+e.getMessage(),e);
 				}
@@ -1081,7 +1081,7 @@
 	* @param objectDescription is the unique identifier of the object.
 	* @param cachedObject is the cached object.
 	*/
-	public void exists(ICacheDescription objectDescription, Object cachedObject) throws MetacartaException
+	public void exists(ICacheDescription objectDescription, Object cachedObject) throws LCFException
 	{
 		// System.out.println("Object created or found: "+objectDescription.getCriticalSectionName());
 		// Save the resultset for return
@@ -1091,7 +1091,7 @@
 	/** Perform the desired operation.  This method is called after either createGetObject()
 	* or exists() is called for every requested object.
 	*/
-	public void execute() throws MetacartaException
+	public void execute() throws LCFException
 	{
 		// Does nothing at all; the query would already have been done
 	}

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/TransactionHandle.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/TransactionHandle.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/TransactionHandle.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/TransactionHandle.java Wed Feb 17 15:57:27 2010
@@ -36,7 +36,7 @@
 	protected int transactionType;
 
 	public TransactionHandle(TransactionHandle previousTransaction, int transactionType)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Grab a unique ID
 		transactionID = IDFactory.make();

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/BinaryInput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/BinaryInput.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/BinaryInput.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/BinaryInput.java Wed Feb 17 15:57:27 2010
@@ -42,7 +42,7 @@
 
 	/** Obtain the stream to pass to JDBC */
 	public InputStream getStream()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (stream == null)
 			openStream();
@@ -51,7 +51,7 @@
 
 	/** Obtain the length to pass to JDBC */
 	public long getLength()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (length == -1L)
 			calculateLength();
@@ -60,7 +60,7 @@
 
 	/** Close the stream we passed to JDBC */
 	public void doneWithStream()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (stream != null)
 			closeStream();
@@ -71,7 +71,7 @@
 
 	/** Discard the object */
 	public void discard()
-		throws MetacartaException
+		throws LCFException
 	{
 		doneWithStream();
 	}
@@ -79,14 +79,14 @@
 	// Protected methods
 	
 	protected abstract void openStream()
-		throws MetacartaException;
+		throws LCFException;
 	
 	protected abstract void calculateLength()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Close the stream */
 	protected void closeStream()
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -95,11 +95,11 @@
 		}
 		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 closing stream: "+e.getMessage(),e,MetacartaException.GENERAL_ERROR);
+			throw new LCFException("IO exception closing stream: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
 		}
 	}
 	

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CacheManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CacheManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CacheManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CacheManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -35,7 +35,7 @@
 	* @return the proper cache manager instance.
 	*/
 	public static ICacheManager make(IThreadContext context)
-		throws MetacartaException
+		throws LCFException
 	{
 		Object o = context.get(cacheManager);
 		if (o == null || !(o instanceof ICacheManager))

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CharacterInput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CharacterInput.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CharacterInput.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/CharacterInput.java Wed Feb 17 15:57:27 2010
@@ -42,7 +42,7 @@
 	}
 
 	public Reader getStream()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (stream == null)
 			openStream();
@@ -50,14 +50,14 @@
 	}
 
 	public void doneWithStream()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (stream != null)
 			closeStream();
 	}
 
 	public long getCharacterLength()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (charLength == -1L)
 			calculateLength();
@@ -65,7 +65,7 @@
 	}
 	
 	public String getHashValue()
-		throws MetacartaException
+		throws LCFException
 	{
 		if (hashValue == null)
 			calculateHashValue();
@@ -74,14 +74,14 @@
 	
 	/** Open a Utf8 stream directly */
 	public abstract InputStream getUtf8Stream()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Transfer to a new object; this causes the current object to become "already discarded" */
 	public abstract CharacterInput transfer();
 	
 	/** Discard this object permanently */
 	public void discard()
-		throws MetacartaException
+		throws LCFException
 	{
 		doneWithStream();
 	}
@@ -90,11 +90,11 @@
 	
 	/** Open a reader, for use by a caller, until closeStream is called */
 	protected abstract void openStream()
-		throws MetacartaException;
+		throws LCFException;
 	
 	/** Close any open reader */
 	protected void closeStream()
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -103,20 +103,20 @@
 		}
 		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("Error closing stream: "+e.getMessage(),e,MetacartaException.GENERAL_ERROR);
+			throw new LCFException("Error closing stream: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
 		}
 	}
 	
 	/** Calculate the datum's length in characters */
 	protected abstract void calculateLength()
-		throws MetacartaException;
+		throws LCFException;
 	
 	/** Calculate the datum's hash value */
 	protected abstract void calculateHashValue()
-		throws MetacartaException;
+		throws LCFException;
 	
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ConfigParams.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ConfigParams.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ConfigParams.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ConfigParams.java Wed Feb 17 15:57:27 2010
@@ -21,7 +21,7 @@
 import org.apache.lcf.core.interfaces.*;
 import java.util.*;
 import java.io.*;
-import org.apache.lcf.core.system.Metacarta;
+import org.apache.lcf.core.system.LCF;
 import org.apache.lcf.core.common.XMLDoc;
 
 /** This class represents a set of configuration parameters, with structure, which is a generalized hierarchy of nodes that
@@ -70,7 +70,7 @@
 	*@param xml is the input XML.
 	*/
 	public ConfigParams(String xml)
-		throws MetacartaException
+		throws LCFException
 	{
 		fromXML(xml);
 	}
@@ -79,7 +79,7 @@
 	*@return the xml corresponding to these ConfigParams.
 	*/
 	public String toXML()
-		throws MetacartaException
+		throws LCFException
 	{
 		XMLDoc doc = new XMLDoc();
 		// name of root node in definition
@@ -101,7 +101,7 @@
 	*@param node is the node.
 	*/
 	protected static void writeNode(XMLDoc doc, Object parent, ConfigNode node)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Get the type
 		String type = node.getType();
@@ -131,7 +131,7 @@
 	*@param xml is the input XML.
 	*/
 	public void fromXML(String xml)
-		throws MetacartaException
+		throws LCFException
 	{
 		children.clear();
 		params.clear();
@@ -141,11 +141,11 @@
 
 		if (list.size() != 1)
 		{
-			throw new MetacartaException("Bad xml - missing outer 'configuration' node - there are "+Integer.toString(list.size())+" nodes");
+			throw new LCFException("Bad xml - missing outer 'configuration' node - there are "+Integer.toString(list.size())+" nodes");
 		}
 		Object parent = list.get(0);
 		if (!doc.getNodeName(parent).equals("configuration"))
-			throw new MetacartaException("Bad xml - outer node is not 'configuration'");
+			throw new LCFException("Bad xml - outer node is not 'configuration'");
 
 		list.clear();
 		doc.processPath(list, "*", parent);
@@ -174,7 +174,7 @@
 	*@return the specification node.
 	*/
 	protected static ConfigNode readNode(XMLDoc doc, Object object)
-		throws MetacartaException
+		throws LCFException
 	{
 		String type = doc.getNodeName(object);
 		ConfigNode rval = new ConfigNode(type);
@@ -222,9 +222,9 @@
 			return rval;
 		try
 		{
-			return Metacarta.deobfuscate(rval);
+			return LCF.deobfuscate(rval);
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			// Ignore this exception, and return an empty string.
 			return "";
@@ -275,9 +275,9 @@
 		{
 			try
 			{
-				value = Metacarta.obfuscate(value);
+				value = LCF.obfuscate(value);
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 				// Ignore this exception, and set "" to be the value
 				value = "";

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DBInterfaceFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DBInterfaceFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DBInterfaceFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DBInterfaceFactory.java Wed Feb 17 15:57:27 2010
@@ -31,7 +31,7 @@
 	}
 
 	public static IDBInterface make(IThreadContext context, String databaseName, String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		String dbName = dbinterfaceInstancePrefix + databaseName;
 		Object x = context.get(dbName);

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DatabaseFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DatabaseFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DatabaseFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/DatabaseFactory.java Wed Feb 17 15:57:27 2010
@@ -35,7 +35,7 @@
 	/** Grab or create the correct instance of a database manager.
 	*/
 	public static IDatabase make(IThreadContext context, String databaseName, String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		String dbName = databaseInstancePrefix + databaseName;
 		Object x = context.get(dbName);

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheExecutor.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheExecutor.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheExecutor.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheExecutor.java Wed Feb 17 15:57:27 2010
@@ -49,7 +49,7 @@
 	* @return the newly created objects to cache, or null, if any object cannot be created.
 	*  The order of the returned objects must correspond to the order of the object descriptinos.
 	*/
-	public Object[] create(ICacheDescription[] objectDescriptions) throws MetacartaException;
+	public Object[] create(ICacheDescription[] objectDescriptions) throws LCFException;
 
 
 	/** Notify the implementing class of the existence of a cached version of the
@@ -59,12 +59,12 @@
 	* @param objectDescription is the unique identifier of the object.
 	* @param cachedObject is the cached object.
 	*/
-	public void exists(ICacheDescription objectDescription, Object cachedObject) throws MetacartaException;
+	public void exists(ICacheDescription objectDescription, Object cachedObject) throws LCFException;
 
 
 	/** Perform the desired operation.  This method is called after either createGetObject()
 	* or exists() is called for every requested object.
 	*/
-	public void execute() throws MetacartaException;
+	public void execute() throws LCFException;
 }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ICacheManager.java Wed Feb 17 15:57:27 2010
@@ -54,7 +54,7 @@
 	*/
 	public void findObjectsAndExecute(ICacheDescription[] locateObjectDescriptions, StringSet invalidateKeys,
 		ICacheExecutor execObject, String transactionID)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Second way of doing cache management.
 	* Basically, this approach breaks the findObjectsAndExecute() method down into bite-sized chunks.
@@ -74,7 +74,7 @@
 	*/
 	public ICacheHandle enterCache(ICacheDescription[] locateObjectDescriptions, StringSet invalidateKeys,
 		String transactionID)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a creation critical section.  This insures that only one thread is
 	* creating the specified objects at a time.  This MUST be paired with
@@ -82,7 +82,7 @@
 	*@param handle is the cache handle.
 	*/
 	public ICacheCreateHandle enterCreateSection(ICacheHandle handle)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Lookup an object.  Returns null if object not found.  If it is found,
 	* object's LRU and expiration info are updated.  The objectDescription passed
@@ -91,7 +91,7 @@
 	*@param objectDescription is the description of the object to look up.
 	*/
 	public Object lookupObject(ICacheCreateHandle handle, ICacheDescription objectDescription)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Save a newly created object.  The object MUST be one of those identified in the
 	* enterCache() method.
@@ -101,25 +101,25 @@
 	*/
 	public void saveObject(ICacheCreateHandle handle, ICacheDescription objectDescription,
 		Object object)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Leave the create section.
 	*@param handle is the handle created by the corresponding enterCreateSection() method.
 	*/
 	public void leaveCreateSection(ICacheCreateHandle handle)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Invalidate keys.  The keys invalidated are what got passed to the enterCache() method.
 	*@param handle is the cache handle.  Does nothing if a null set of keys was passed in.
 	*/
 	public void invalidateKeys(ICacheHandle handle)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Leave the cache.  Must be paired with enterCache, above.
 	*@param handle is the handle of the cache we are leaving.
 	*/
 	public void leaveCache(ICacheHandle handle)
-		throws MetacartaException;
+		throws LCFException;
 
 	// The following methods are used to communicate transaction information to the cache.
 
@@ -129,7 +129,7 @@
 	*@param enclosingTransactionID is the id of the transaction that is in effect, or null.
 	*/
 	public void startTransaction(String startingTransactionID, String enclosingTransactionID)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Commit a cache transaction.
 	* This method MUST be called when a transaction successfully ends, or open locks will not be closed!!!
@@ -138,7 +138,7 @@
 	*@param transactionID is the id of the transaction that is ending.
 	*/
 	public void commitTransaction(String transactionID)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Roll back a cache transaction.
 	* This method releases all objects cached against the ending transaction ID, and releases all locks
@@ -146,7 +146,7 @@
 	*@param transactionID is the id of the transaction that is ending.
 	*/
 	public void rollbackTransaction(String transactionID)
-		throws MetacartaException;
+		throws LCFException;
 
 	// This is a maintenance method; call it when convenient.
 
@@ -154,6 +154,6 @@
 	*@param currentTimestamp is the current time in milliseconds since epoch.
 	*/
 	public void expireObjects(long currentTimestamp)
-		throws MetacartaException;
+		throws LCFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDBInterface.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDBInterface.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDBInterface.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDBInterface.java Wed Feb 17 15:57:27 2010
@@ -58,7 +58,7 @@
 	*@param tableName is the name of the table.
 	*/
 	public void performLock(String tableName)
-		throws MetacartaException;
+		throws LCFException;
 		
 	/** Perform an insert operation.
 	*@param tableName is the name of the table.
@@ -67,7 +67,7 @@
 	*@param parameterMap is the map of column name/values to write.
 	*/
 	public void performInsert(String tableName, Map parameterMap, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform an update operation.
 	*@param tableName is the name of the table.
@@ -77,7 +77,7 @@
 	*@param whereParameters are the parameters that come with the where clause, if any.
 	*/
 	public void performUpdate(String tableName, Map parameterMap, String whereClause, ArrayList whereParameters, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a delete operation.
 	*@param tableName is the name of the table to delete from.
@@ -86,7 +86,7 @@
 	*@param whereParameters are the parameters that come with the where clause, if any.
 	*/
 	public void performDelete(String tableName, String whereClause, ArrayList whereParameters, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a table creation operation.
 	*@param tableName is the name of the table to create.
@@ -96,7 +96,7 @@
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performCreate(String tableName, Map columnMap, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a table alter operation.
 	*@param tableName is the name of the table to alter.
@@ -110,7 +110,7 @@
 	*/
 	public void performAlter(String tableName, Map columnMap, Map columnModifyMap, ArrayList columnDeleteList,
 		StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Add an index to a table.
 	*@param tableName is the name of the table to add the index for.
@@ -119,7 +119,7 @@
 	* in the index, in order.
 	*/
 	public void addTableIndex(String tableName, boolean unique, ArrayList columnList)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Add an index to a table.
 	*@param tableName is the name of the table to add the index for.
@@ -127,52 +127,52 @@
 	*@param description is the index description.
 	*/
 	public void performAddIndex(String indexName, String tableName, IndexDescription description)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Remove an index.
 	*@param indexName is the name of the index to remove.
 	*/
 	public void performRemoveIndex(String indexName)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Analyze a table.
 	*@param tableName is the name of the table to analyze/calculate statistics for.
 	*/
 	public void analyzeTable(String tableName)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Reindex a table.
 	*@param tableName is the name of the table to rebuild indexes for.
 	*/
 	public void reindexTable(String tableName)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a table drop operation.
 	*@param tableName is the name of the table to drop.
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performDrop(String tableName, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform user lookup.
 	*@param userName is the user name to lookup.
 	*@return true if the user exists.
 	*/
 	public boolean lookupUser(String userName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform user create.
 	*@param userName is the user name.
 	*@param password is the user's password.
 	*/
 	public void performCreateUser(String userName, String password)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform user delete.
 	*@param userName is the user name.
 	*/
 	public void performDropUser(String userName)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform database lookup.
 	*@param databaseName is the database name.
@@ -180,7 +180,7 @@
 	*@return true if the database exists.
 	*/
 	public boolean lookupDatabase(String databaseName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform database create.
 	*@param databaseName is the database name.
@@ -190,14 +190,14 @@
 	*/
 	public void performCreateDatabase(String databaseName, String databaseUser, String databasePassword,
 		StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform database drop.
 	*@param databaseName is the database name.
 	*@param invalidateKeys are the cache keys that should be invalidated, if any.
 	*/
 	public void performDropDatabase(String databaseName, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Get a table's schema.
 	*@param tableName is the name of the table.
@@ -206,7 +206,7 @@
 	*@return a map of column names and ColumnDescription objects, describing the schema.
 	*/
 	public Map getTableSchema(String tableName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Get a table's indexes.
 	*@param tableName is the name of the table.
@@ -215,7 +215,7 @@
 	*@return a map of index names and IndexDescription objects, describing the indexes.
 	*/
 	public Map getTableIndexes(String tableName, StringSet cacheKeys, String queryClass)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Get a database's tables.
 	*@param cacheKeys are the cache keys for the query, or null.
@@ -223,7 +223,7 @@
 	*@return the set of tables.
 	*/
 	public StringSet getAllTables(StringSet cacheKeys, String queryClass)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a general database modification query.
 	*@param query is the query string.
@@ -231,7 +231,7 @@
 	*@param invalidateKeys are the cache keys to invalidate.
 	*/
 	public void performModification(String query, ArrayList params, StringSet invalidateKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a general "data fetch" query.
 	*@param query is the query string.
@@ -242,7 +242,7 @@
 	*@return a resultset.
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a general "data fetch" query.
 	*@param query is the query string.
@@ -256,7 +256,7 @@
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
 		int maxResults, ILimitChecker returnLimit)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Perform a general "data fetch" query.
 	*@param query is the query string.
@@ -271,7 +271,7 @@
 	*/
 	public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
 		int maxResults, ResultSpecification resultSpec, ILimitChecker returnLimit)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Quote a sql string.
 	* This method quotes a sql string in the proper manner for the database in question.
@@ -307,7 +307,7 @@
 	* if not otherwise determined).
 	*/
 	public void beginTransaction()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Begin a database transaction.  This method call MUST be paired with an endTransaction() call,
 	* or database handles will be lost.  If the transaction should be rolled back, then signalRollback() should
@@ -319,7 +319,7 @@
 	*@param transactionType is the kind of transaction desired.
 	*/
 	public void beginTransaction(int transactionType)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Signal that a rollback should occur on the next endTransaction().
 	*/
@@ -329,7 +329,7 @@
 	* signalRollback() was called within the transaction).
 	*/
 	public void endTransaction()
-		throws MetacartaException;
+		throws LCFException;
 
 }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDFactory.java Wed Feb 17 15:57:27 2010
@@ -18,7 +18,7 @@
 */
 package org.apache.lcf.core.interfaces;
 
-import org.apache.lcf.core.system.Metacarta;
+import org.apache.lcf.core.system.LCF;
 import org.apache.lcf.core.system.Logging;
 import java.io.*;
 import java.util.*;
@@ -43,13 +43,13 @@
 	}
 
 	public static String make()
-		throws MetacartaException
+		throws LCFException
 	{
 		synchronized (_proplock)
 		{
 			if (propertyChecked == false)
 			{
-				String synchDirectory = Metacarta.getProperty(Metacarta.synchDirectoryProperty);
+				String synchDirectory = LCF.getProperty(LCF.synchDirectoryProperty);
 				if (synchDirectory != null)
 				{
 					idFile = new File(synchDirectory,"idfile.file");
@@ -80,18 +80,18 @@
 					}
 					catch (InterruptedIOException e)
 					{
-						throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 					}
 					catch (IOException e)
 					{
 						// same as returning false above.
 					}
-					Metacarta.sleep(10);
+					LCF.sleep(10);
 				}
 			    }
 			    catch (InterruptedException e)
 			    {
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			    }
 
 			}
@@ -126,7 +126,7 @@
 				    		}
 						catch (IOException e)
 						{
-							throw new MetacartaException("Could not read from id file: '"+idFile.toString()+"'",e);
+							throw new LCFException("Could not read from id file: '"+idFile.toString()+"'",e);
 						}
 						finally
 						{
@@ -135,7 +135,7 @@
 					}
 					catch (IOException e)
 					{
-						throw new MetacartaException("Could not read from id file: '"+idFile.toString()+"'",e);
+						throw new LCFException("Could not read from id file: '"+idFile.toString()+"'",e);
 					}
 					finally
 					{
@@ -187,7 +187,7 @@
 				    catch (IOException e)
 				    {
 					// Hard failure
-					throw new MetacartaException("Can't write id file",e);
+					throw new LCFException("Can't write id file",e);
 				    }
 
 				}

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDatabase.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDatabase.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDatabase.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IDatabase.java Wed Feb 17 15:57:27 2010
@@ -75,7 +75,7 @@
 	*/
 	public IResultSet executeQuery(String query, ArrayList params, StringSet cacheKeys, StringSet invalidateKeys,
 		String queryClass, boolean needResult, int maxReturn, ResultSpecification spec, ILimitChecker returnLimits)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Begin a database transaction.  This method call MUST be paired with an endTransaction() call,
 	* or database handles will be lost.  If the transaction should be rolled back, then signalRollback() should
@@ -87,7 +87,7 @@
 	*@param transactionType describes the type of the transaction.
 	*/
 	public void beginTransaction(int transactionType)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Signal that a rollback should occur on the next endTransaction().
 	*/
@@ -97,6 +97,6 @@
 	* signalRollback() was called within the transaction).
 	*/
 	public void endTransaction()
-		throws MetacartaException;
+		throws LCFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IKeystoreManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IKeystoreManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IKeystoreManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/IKeystoreManager.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
 
 /** This interface describes a class that manages keys and certificates in a secure manner.
 * It's built on top of the JDK 1.4+ JSSE integration, and provides all the necessary logic
-* to work well within the Metacarta java environment.
+* to work well within the LCF java environment.
 */
 public interface IKeystoreManager
 {
@@ -32,48 +32,48 @@
 	*@return the list, as a string array.
 	*/
 	public String[] getContents()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** For an alias, get some descriptive information from the object in the keystore.
 	*@param alias is the alias name.
 	*@return a description of what's in the alias.
 	*/
 	public String getDescription(String alias)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Import a certificate or key into the list.  The data must be added as binary.
 	*@param alias is the name of the certificate.
 	*@param certData is the binary data for the certificate.
 	*/
 	public void importCertificate(String alias, InputStream certData)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Remove a certificate.
 	*@param alias is the name of the certificate to remove.
 	*/
 	public void remove(String alias)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Convert to a base64 string.
 	*@return the base64-encoded string.
 	*/
 	public String getString()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Read a certificate from the keystore.
 	*/
 	public java.security.cert.Certificate getCertificate(String alias)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Add a certificate to the keystore.
 	*/
 	public void addCertificate(String alias, java.security.cert.Certificate certificate)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Build a secure socket factory based on this keystore.
 	*/
 	public javax.net.ssl.SSLSocketFactory getSecureSocketFactory()
-		throws MetacartaException;
+		throws LCFException;
 
 
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILimitChecker.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILimitChecker.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILimitChecker.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILimitChecker.java Wed Feb 17 15:57:27 2010
@@ -61,11 +61,11 @@
 	*@return true if it should be included, false otherwise.
 	*/
 	public boolean checkInclude(IResultRow row)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** See if we should examine another row.
 	*@return true if we need to keep going, or false if we are done.
 	*/
 	public boolean checkContinue()
-		throws MetacartaException;
+		throws LCFException;
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILockManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILockManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILockManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/ILockManager.java Wed Feb 17 15:57:27 2010
@@ -33,7 +33,7 @@
 	* thread.
 	*/
 	public void timedWait(int time)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a write locked code area (i.e., block out both readers and other writers).
 	* Write locks permit only ONE thread to be in the named section, across JVM's
@@ -42,7 +42,7 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void enterWriteLock(String lockKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a write locked code area (i.e., block out both readers and other writers),
 	* but do not wait if the lock cannot be obtained.
@@ -52,14 +52,14 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void enterWriteLockNoWait(String lockKey)
-		throws MetacartaException, LockException;
+		throws LCFException, LockException;
 
 	/** Leave a write locked code area.  Use this method to exit a write-locked section. The lockKey
 	* parameter must correspond to the key used for the enter method.
 	* @param lockKey is the name of the lock.
 	*/
 	public void leaveWriteLock(String lockKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a non-exclusive write-locked area (blocking out all readers, but letting in other "writers").
 	* This kind of lock is designed to be used in conjunction with read locks.  It is used typically in
@@ -70,7 +70,7 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void enterNonExWriteLock(String lockKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a non-exclusive write-locked area (blocking out all readers, but letting in other "writers").
 	* This kind of lock is designed to be used in conjunction with read locks.  It is used typically in
@@ -81,7 +81,7 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void enterNonExWriteLockNoWait(String lockKey)
-		throws MetacartaException, LockException;
+		throws LCFException, LockException;
 
 	/** Leave a non-exclusive write locked code area.  Use this method to exit a non-ex-write-locked section.
 	* The lockKey
@@ -89,7 +89,7 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void leaveNonExWriteLock(String lockKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a read-only locked area (i.e., block ONLY if there's a writer).  This kind of lock
 	* permits multiple threads inside the same code area, but only if there is no "writer" in the
@@ -98,7 +98,7 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void enterReadLock(String lockKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a read-only locked area (i.e., block ONLY if there's a writer).  This kind of lock
 	* permits multiple threads inside the same code area, but only if there is no "writer" in the
@@ -107,14 +107,14 @@
 	*@param lockKey is the name of the lock.
 	*/
 	public void enterReadLockNoWait(String lockKey)
-		throws MetacartaException, LockException;
+		throws LCFException, LockException;
 
 	/** Leave a read-locked code area.  Use this method to exit a read-locked section.  The lockKey
 	* parameter must correspond to the key used for the enter method.
 	*@param lockKey is the name of the lock.
 	*/
 	public void leaveReadLock(String lockKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter multiple locks simultaneously.  Use this method if a series or set of locks needs to be
 	* thrown for an operation to take place.  This operation will avoid deadlock if all the locks are
@@ -125,7 +125,7 @@
 	*@param writeLocks is an array of write lock names, or null if there are none desired.
 	*/
 	public void enterLocks(String[] readLocks, String[] nonExWriteLocks, String[] writeLocks)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter multiple locks simultaneously.  Use this method if a series or set of locks needs to be
 	* thrown for an operation to take place.  This operation will avoid deadlock if all the locks are
@@ -136,7 +136,7 @@
 	*@param writeLocks is an array of write lock names, or null if there are none desired.
 	*/
 	public void enterLocksNoWait(String[] readLocks, String[] nonExWriteLocks, String[] writeLocks)
-		throws MetacartaException, LockException;
+		throws LCFException, LockException;
 
 	/** Leave multiple locks. Use this method to leave a section started with enterLocks() or
 	* enterLocksNoWait().  The parameters must correspond to those passed to the enter method.
@@ -145,13 +145,13 @@
 	*@param writeLocks is an array of write lock names, or null if there are none desired.
 	*/
 	public void leaveLocks(String[] readLocks, String[] nonExWriteLocks, String[] writeLocks)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Clear all outstanding locks in the system.
 	* This is a very dangerous method to use (obviously)...
 	*/
 	public void clearLocks()
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a named, read critical section (NOT a lock).  Critical sections never cross JVM boundaries.
 	* Critical section names do not collide with lock names; they have a distinct namespace.
@@ -159,7 +159,7 @@
 	* section at a time.
 	*/
 	public void enterReadCriticalSection(String sectionKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Leave a named, read critical section (NOT a lock).  Critical sections never cross JVM boundaries.
 	* Critical section names do not collide with lock names; they have a distinct namespace.
@@ -167,7 +167,7 @@
 	* section at a time.
 	*/
 	public void leaveReadCriticalSection(String sectionKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter a named, non-exclusive write critical section (NOT a lock).  Critical sections never cross JVM boundaries.
 	* Critical section names do not collide with lock names; they have a distinct namespace.
@@ -175,7 +175,7 @@
 	* section at a time.
 	*/
 	public void enterNonExWriteCriticalSection(String sectionKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Leave a named, non-exclusive write critical section (NOT a lock).  Critical sections never cross JVM boundaries.
 	* Critical section names do not collide with lock names; they have a distinct namespace.
@@ -183,7 +183,7 @@
 	* section at a time.
 	*/
 	public void leaveNonExWriteCriticalSection(String sectionKey)
-		throws MetacartaException;
+		throws LCFException;
 
 
 	/** Enter a named, exclusive write critical section (NOT a lock).  Critical sections never cross JVM boundaries.
@@ -192,7 +192,7 @@
 	* section at a time.
 	*/
 	public void enterWriteCriticalSection(String sectionKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Leave a named, exclusive write critical section (NOT a lock).  Critical sections never cross JVM boundaries.
 	* Critical section names do not collide with lock names; they have a distinct namespace.
@@ -200,7 +200,7 @@
 	* section at a time.
 	*/
 	public void leaveWriteCriticalSection(String sectionKey)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Enter multiple critical sections simultaneously.
 	*@param readSectionKeys is an array of read section descriptors, or null if there are no read sections desired.
@@ -208,7 +208,7 @@
 	*@param writeSectionKeys is an array of write section descriptors, or null if there are none desired.
 	*/
 	public void enterCriticalSections(String[] readSectionKeys, String[] nonExSectionKeys, String[] writeSectionKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 	/** Leave multiple critical sections simultaneously.
 	*@param readSectionKeys is an array of read section descriptors, or null if there are no read sections desired.
@@ -216,6 +216,6 @@
 	*@param writeSectionKeys is an array of write section descriptors, or null if there are none desired.
 	*/
 	public void leaveCriticalSections(String[] readSectionKeys, String[] nonExSectionKeys, String[] writeSectionKeys)
-		throws MetacartaException;
+		throws LCFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/KeystoreManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/KeystoreManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/KeystoreManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/KeystoreManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -31,7 +31,7 @@
 	/** Mint a keystore manager.
 	*/
 	public static IKeystoreManager make(String passcode)
-		throws MetacartaException
+		throws LCFException
 	{
 		return new KeystoreManager(passcode);
 	}
@@ -39,7 +39,7 @@
 	/** Mint a keystore manager from a base-64 encoded string.
 	*/
 	public static IKeystoreManager make(String passcode, String base64String)
-		throws MetacartaException
+		throws LCFException
 	{
 		return new KeystoreManager(passcode,base64String);
 	}
@@ -49,7 +49,7 @@
 	/** Build a secure socket factory that pays no attention to certificates in trust store, and just trusts everything.
 	*/
 	public static javax.net.ssl.SSLSocketFactory getTrustingSecureSocketFactory()
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -63,11 +63,11 @@
 	    }
 	    catch (java.security.NoSuchAlgorithmException e)
 	    {
-		throw new MetacartaException("No such algorithm: "+e.getMessage(),e);
+		throw new LCFException("No such algorithm: "+e.getMessage(),e);
 	    }
 	    catch (java.security.KeyManagementException e)
 	    {
-		throw new MetacartaException("Key management exception: "+e.getMessage(),e);
+		throw new LCFException("Key management exception: "+e.getMessage(),e);
 	    }
 	}
 

Added: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LCFException.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LCFException.java?rev=911029&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LCFException.java (added)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LCFException.java Wed Feb 17 15:57:27 2010
@@ -0,0 +1,78 @@
+/* $Id$ */
+
+/**
+* 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.lcf.core.interfaces;
+
+public class LCFException extends Exception
+{
+	public static final String _rcsid = "@(#)$Id$";
+
+	public final static int GENERAL_ERROR = 0;
+	public final static int DATABASE_ERROR = 1;
+	public final static int INTERRUPTED = 2;
+	public final static int SETUP_ERROR = 3;
+	public final static int DATABASE_CONNECTION_ERROR = 4;
+	public final static int REPOSITORY_CONNECTION_ERROR = 5;
+	public final static int DATABASE_TRANSACTION_ABORT = 6;
+	// MHL
+
+	protected int errcode;
+
+	public LCFException(String errString)
+	{
+		super(errString);
+		this.errcode = GENERAL_ERROR;
+	}
+
+	public LCFException(String errString, int errcode)
+	{
+		super(errString);
+		this.errcode = errcode;
+	}
+
+	public LCFException(String errString, Throwable cause, int errcode)
+	{
+		super(errString,cause);
+		this.errcode = errcode;
+	}
+
+	public LCFException(String errString, Throwable cause)
+	{
+		super(errString,cause);
+		this.errcode = GENERAL_ERROR;
+	}
+
+	public LCFException(Throwable cause, int errcode)
+	{
+		super(cause);
+		this.errcode = errcode;
+	}
+
+	public LCFException(Throwable cause)
+	{
+		super(cause);
+		this.errcode = GENERAL_ERROR;
+	}
+
+	public int getErrorCode()
+	{
+		return errcode;
+	}
+
+
+}

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LockManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LockManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LockManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/LockManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -33,7 +33,7 @@
 	* thread).
 	*/
 	public static ILockManager make(IThreadContext context)
-		throws MetacartaException
+		throws LCFException
 	{
 		Object x = context.get(lockManager);
 		if (x == null || !(x instanceof ILockManager))

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/Specification.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/Specification.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/Specification.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/interfaces/Specification.java Wed Feb 17 15:57:27 2010
@@ -44,7 +44,7 @@
 	*@param xml is the input XML.
 	*/
 	public Specification(String xml)
-		throws MetacartaException
+		throws LCFException
 	{
 		fromXML(xml);
 	}
@@ -70,7 +70,7 @@
 	*@return the xml corresponding to this DocumentSpecification.
 	*/
 	public String toXML()
-		throws MetacartaException
+		throws LCFException
 	{
 		XMLDoc doc = new XMLDoc();
 		// name of root node in definition
@@ -92,7 +92,7 @@
 	*@param node is the node.
 	*/
 	protected static void writeNode(XMLDoc doc, Object parent, SpecificationNode node)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Get the type
 		String type = node.getType();
@@ -122,7 +122,7 @@
 	*@param xml is the input XML.
 	*/
 	public void fromXML(String xml)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (readOnly)
 			throw new IllegalStateException("Attempt to change read-only object");
@@ -133,11 +133,11 @@
 
 		if (list.size() != 1)
 		{
-			throw new MetacartaException("Bad xml - missing outer 'specification' node - there are "+Integer.toString(list.size())+" nodes");
+			throw new LCFException("Bad xml - missing outer 'specification' node - there are "+Integer.toString(list.size())+" nodes");
 		}
 		Object parent = list.get(0);
 		if (!doc.getNodeName(parent).equals("specification"))
-			throw new MetacartaException("Bad xml - outer node is not 'specification'");
+			throw new LCFException("Bad xml - outer node is not 'specification'");
 
 		list.clear();
 		doc.processPath(list, "*", parent);
@@ -158,7 +158,7 @@
 	*@return the specification node.
 	*/
 	protected static SpecificationNode readNode(XMLDoc doc, Object object)
-		throws MetacartaException
+		throws LCFException
 	{
 		String type = doc.getNodeName(object);
 		SpecificationNode rval = new SpecificationNode(type);



Mime
View raw message