incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r988237 [13/24] - in /incubator/lcf/trunk: modules/connectors/activedirectory/connector/org/apache/acf/authorities/authorities/activedirectory/ modules/connectors/documentum/connector/org/apache/acf/crawler/authorities/DCTM/ modules/connect...
Date Mon, 23 Aug 2010 18:08:42 GMT
Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Configuration.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Configuration.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Configuration.java Mon Aug 23 18:08:32 2010
@@ -21,7 +21,7 @@ package org.apache.acf.core.interfaces;
 import org.apache.acf.core.interfaces.*;
 import java.util.*;
 import java.io.*;
-import org.apache.acf.core.system.LCF;
+import org.apache.acf.core.system.ACF;
 import org.apache.acf.core.common.XMLDoc;
 import org.json.*;
 
@@ -141,7 +141,7 @@ public class Configuration
   *@return the xml corresponding to these Configuration.
   */
   public String toXML()
-    throws LCFException
+    throws ACFException
   {
     XMLDoc doc = new XMLDoc();
     // name of root node in definition
@@ -161,7 +161,7 @@ public class Configuration
   *@return the json corresponding to this Configuration.
   */
   public String toJSON()
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -254,7 +254,7 @@ public class Configuration
     }
     catch (JSONException e)
     {
-      throw new LCFException(e.getMessage(),e);
+      throw new ACFException(e.getMessage(),e);
     }
   }
   
@@ -264,7 +264,7 @@ public class Configuration
   *@param node is the node.
   */
   protected static void writeNode(XMLDoc doc, Object parent, ConfigurationNode node)
-    throws LCFException
+    throws ACFException
   {
     // Get the type
     String type = node.getType();
@@ -297,7 +297,7 @@ public class Configuration
   *@param writeKey is true if the key needs to be written, false otherwise.
   */
   protected static void writeNode(JSONWriter writer, ConfigurationNode node, boolean writeKey, boolean writeSpecialKey)
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -429,7 +429,7 @@ public class Configuration
     }
     catch (JSONException e)
     {
-      throw new LCFException(e.getMessage(),e);
+      throw new ACFException(e.getMessage(),e);
     }
   }
   
@@ -437,7 +437,7 @@ public class Configuration
   *@param xml is the input XML.
   */
   public void fromXML(String xml)
-    throws LCFException
+    throws ACFException
   {
     XMLDoc doc = new XMLDoc(xml);
     initializeFromDoc(doc);
@@ -447,7 +447,7 @@ public class Configuration
   *@param json is the input JSON.
   */
   public void fromJSON(String json)
-    throws LCFException
+    throws ACFException
   {
     if (readOnly)
       throw new IllegalStateException("Attempt to change read-only object");
@@ -479,13 +479,13 @@ public class Configuration
     }
     catch (JSONException e)
     {
-      throw new LCFException("Json syntax error - "+e.getMessage(),e);
+      throw new ACFException("Json syntax error - "+e.getMessage(),e);
     }
   }
   
   /** Process a JSON object */
   protected void processObject(String key, Object x)
-    throws LCFException
+    throws ACFException
   {
     if (x instanceof JSONObject)
     {
@@ -501,14 +501,14 @@ public class Configuration
     {
       // Children, as a list of separately enumerated child nodes.
       if (!(x instanceof JSONArray))
-        throw new LCFException("Expected array contents for '"+JSON_CHILDREN+"' node");
+        throw new ACFException("Expected array contents for '"+JSON_CHILDREN+"' node");
       JSONArray array = (JSONArray)x;
       int i = 0;
       while (i < array.length())
       {
         Object z = array.opt(i++);
         if (!(z instanceof JSONObject))
-          throw new LCFException("Expected object as array member");
+          throw new ACFException("Expected object as array member");
         ConfigurationNode nestedCn = readNode((String)null,(JSONObject)z);
         addChild(getChildCount(),nestedCn);
       }
@@ -525,7 +525,7 @@ public class Configuration
   
   /** Read a node from a json object */
   protected ConfigurationNode readNode(String key, JSONObject object)
-    throws LCFException
+    throws ACFException
   {
     // Override key if type field is found.
     if (object.has(JSON_TYPE))
@@ -536,11 +536,11 @@ public class Configuration
       }
       catch (JSONException e)
       {
-        throw new LCFException("Exception decoding JSON: "+e.getMessage());
+        throw new ACFException("Exception decoding JSON: "+e.getMessage());
       }
     }
     if (key == null)
-      throw new LCFException("No type found for node");
+      throw new ACFException("No type found for node");
     Iterator iter;
     ConfigurationNode rval = createNewNode(key);
     iter = object.keys();
@@ -570,7 +570,7 @@ public class Configuration
   
   /** Process a JSON object */
   protected void processObject(ConfigurationNode cn, String key, Object x)
-    throws LCFException
+    throws ACFException
   {
     if (x instanceof JSONObject)
     {
@@ -601,14 +601,14 @@ public class Configuration
       {
         // Children, as a list of separately enumerated child nodes.
         if (!(x instanceof JSONArray))
-          throw new LCFException("Expected array contents for '"+JSON_CHILDREN+"' node");
+          throw new ACFException("Expected array contents for '"+JSON_CHILDREN+"' node");
         JSONArray array = (JSONArray)x;
         int i = 0;
         while (i < array.length())
         {
           Object z = array.opt(i++);
           if (!(z instanceof JSONObject))
-            throw new LCFException("Expected object as array member");
+            throw new ACFException("Expected object as array member");
           ConfigurationNode nestedCn = readNode((String)null,(JSONObject)z);
           cn.addChild(cn.getChildCount(),nestedCn);
         }
@@ -628,14 +628,14 @@ public class Configuration
   *@param xmlstream is the input XML stream.  Does NOT close the stream.
   */
   public void fromXML(InputStream xmlstream)
-    throws LCFException
+    throws ACFException
   {
     XMLDoc doc = new XMLDoc(xmlstream);
     initializeFromDoc(doc);
   }
 
   protected void initializeFromDoc(XMLDoc doc)
-    throws LCFException
+    throws ACFException
   {
     if (readOnly)
       throw new IllegalStateException("Attempt to change read-only object");
@@ -645,11 +645,11 @@ public class Configuration
 
     if (list.size() != 1)
     {
-      throw new LCFException("Bad xml - missing outer '"+rootNodeLabel+"' node - there are "+Integer.toString(list.size())+" nodes");
+      throw new ACFException("Bad xml - missing outer '"+rootNodeLabel+"' node - there are "+Integer.toString(list.size())+" nodes");
     }
     Object parent = list.get(0);
     if (!doc.getNodeName(parent).equals(rootNodeLabel))
-      throw new LCFException("Bad xml - outer node is not '"+rootNodeLabel+"'");
+      throw new ACFException("Bad xml - outer node is not '"+rootNodeLabel+"'");
 
     list.clear();
     doc.processPath(list, "*", parent);
@@ -670,7 +670,7 @@ public class Configuration
   *@return the specification node.
   */
   protected ConfigurationNode readNode(XMLDoc doc, Object object)
-    throws LCFException
+    throws ACFException
   {
     String type = doc.getNodeName(object);
     ConfigurationNode rval = createNewNode(type);

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/DBInterfaceFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/DBInterfaceFactory.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/DBInterfaceFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/DBInterfaceFactory.java Mon Aug 23 18:08:32 2010
@@ -18,7 +18,7 @@
 */
 package org.apache.acf.core.interfaces;
 
-import org.apache.acf.core.system.LCF;
+import org.apache.acf.core.system.ACF;
 import java.lang.reflect.*;
 
 /** This is the factory class for an IDBInterface.
@@ -34,13 +34,13 @@ public class DBInterfaceFactory
   }
 
   public static IDBInterface make(IThreadContext context, String databaseName, String userName, String password)
-    throws LCFException
+    throws ACFException
   {
     String dbName = dbinterfaceInstancePrefix + databaseName;
     Object x = context.get(dbName);
     if (x == null || !(x instanceof IDBInterface))
     {
-      String implementationClass = LCF.getProperty(LCF.databaseImplementation);
+      String implementationClass = ACF.getProperty(ACF.databaseImplementation);
       if (implementationClass == null)
         implementationClass = "org.apache.acf.core.database.DBInterfacePostgreSQL";
       try
@@ -49,36 +49,36 @@ public class DBInterfaceFactory
         Constructor constructor = c.getConstructor(new Class[]{IThreadContext.class,String.class,String.class,String.class});
         x = constructor.newInstance(new Object[]{context,databaseName,userName,password});
         if (!(x instanceof IDBInterface))
-          throw new LCFException("Database implementation class "+implementationClass+" does not implement IDBInterface",LCFException.SETUP_ERROR);
+          throw new ACFException("Database implementation class "+implementationClass+" does not implement IDBInterface",ACFException.SETUP_ERROR);
         context.save(dbName,x);
       }
       catch (ClassNotFoundException e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" could not be found: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" could not be found: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (ExceptionInInitializerError e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (LinkageError e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" could not be linked: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" could not be linked: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (InstantiationException e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (InvocationTargetException e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (NoSuchMethodException e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" had no constructor taking (IThreadContext, String, String, String): "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" had no constructor taking (IThreadContext, String, String, String): "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (IllegalAccessException e)
       {
-        throw new LCFException("Database implementation class "+implementationClass+" had no public constructor taking (IThreadContext, String, String, String): "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Database implementation class "+implementationClass+" had no public constructor taking (IThreadContext, String, String, String): "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
     }
     return (IDBInterface)x;

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheExecutor.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheExecutor.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheExecutor.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheExecutor.java Mon Aug 23 18:08:32 2010
@@ -49,7 +49,7 @@ public interface ICacheExecutor
   * @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 LCFException;
+  public Object[] create(ICacheDescription[] objectDescriptions) throws ACFException;
 
 
   /** Notify the implementing class of the existence of a cached version of the
@@ -59,12 +59,12 @@ public interface ICacheExecutor
   * @param objectDescription is the unique identifier of the object.
   * @param cachedObject is the cached object.
   */
-  public void exists(ICacheDescription objectDescription, Object cachedObject) throws LCFException;
+  public void exists(ICacheDescription objectDescription, Object cachedObject) throws ACFException;
 
 
   /** Perform the desired operation.  This method is called after either createGetObject()
   * or exists() is called for every requested object.
   */
-  public void execute() throws LCFException;
+  public void execute() throws ACFException;
 }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheManager.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ICacheManager.java Mon Aug 23 18:08:32 2010
@@ -54,7 +54,7 @@ public interface ICacheManager
   */
   public void findObjectsAndExecute(ICacheDescription[] locateObjectDescriptions, StringSet invalidateKeys,
     ICacheExecutor execObject, String transactionID)
-    throws LCFException;
+    throws ACFException;
 
   /** Second way of doing cache management.
   * Basically, this approach breaks the findObjectsAndExecute() method down into bite-sized chunks.
@@ -74,7 +74,7 @@ public interface ICacheManager
   */
   public ICacheHandle enterCache(ICacheDescription[] locateObjectDescriptions, StringSet invalidateKeys,
     String transactionID)
-    throws LCFException;
+    throws ACFException;
 
   /** 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 @@ public interface ICacheManager
   *@param handle is the cache handle.
   */
   public ICacheCreateHandle enterCreateSection(ICacheHandle handle)
-    throws LCFException;
+    throws ACFException;
 
   /** 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 @@ public interface ICacheManager
   *@param objectDescription is the description of the object to look up.
   */
   public Object lookupObject(ICacheCreateHandle handle, ICacheDescription objectDescription)
-    throws LCFException;
+    throws ACFException;
 
   /** Save a newly created object.  The object MUST be one of those identified in the
   * enterCache() method.
@@ -101,25 +101,25 @@ public interface ICacheManager
   */
   public void saveObject(ICacheCreateHandle handle, ICacheDescription objectDescription,
     Object object)
-    throws LCFException;
+    throws ACFException;
 
   /** Leave the create section.
   *@param handle is the handle created by the corresponding enterCreateSection() method.
   */
   public void leaveCreateSection(ICacheCreateHandle handle)
-    throws LCFException;
+    throws ACFException;
 
   /** 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 LCFException;
+    throws ACFException;
 
   /** 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 LCFException;
+    throws ACFException;
 
   // The following methods are used to communicate transaction information to the cache.
 
@@ -129,7 +129,7 @@ public interface ICacheManager
   *@param enclosingTransactionID is the id of the transaction that is in effect, or null.
   */
   public void startTransaction(String startingTransactionID, String enclosingTransactionID)
-    throws LCFException;
+    throws ACFException;
 
   /** 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 @@ public interface ICacheManager
   *@param transactionID is the id of the transaction that is ending.
   */
   public void commitTransaction(String transactionID)
-    throws LCFException;
+    throws ACFException;
 
   /** Roll back a cache transaction.
   * This method releases all objects cached against the ending transaction ID, and releases all locks
@@ -146,7 +146,7 @@ public interface ICacheManager
   *@param transactionID is the id of the transaction that is ending.
   */
   public void rollbackTransaction(String transactionID)
-    throws LCFException;
+    throws ACFException;
 
   // This is a maintenance method; call it when convenient.
 
@@ -154,6 +154,6 @@ public interface ICacheManager
   *@param currentTimestamp is the current time in milliseconds since epoch.
   */
   public void expireObjects(long currentTimestamp)
-    throws LCFException;
+    throws ACFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IConnector.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IConnector.java Mon Aug 23 18:08:32 2010
@@ -34,7 +34,7 @@ public interface IConnector
   *@param threadContext is the current thread context.
   */
   public void install(IThreadContext threadContext)
-    throws LCFException;
+    throws ACFException;
 
   /** Uninstall the connector.
   * This method is called to remove persistent storage for the connector, such as database tables etc.
@@ -42,7 +42,7 @@ public interface IConnector
   *@param threadContext is the current thread context.
   */
   public void deinstall(IThreadContext threadContext)
-    throws LCFException;
+    throws ACFException;
 
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
@@ -56,18 +56,18 @@ public interface IConnector
   *@return the connection's status as a displayable string.
   */
   public String check()
-    throws LCFException;
+    throws ACFException;
 
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
   public void poll()
-    throws LCFException;
+    throws ACFException;
 
   /** Close the connection.  Call this before discarding the repository connector.
   */
   public void disconnect()
-    throws LCFException;
+    throws ACFException;
 
   /** Get configuration information.
   *@return the configuration information for this class.
@@ -99,7 +99,7 @@ public interface IConnector
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
-    throws LCFException, IOException;
+    throws ACFException, IOException;
   
   /** Output the configuration body section.
   * This method is called in the body section of the authority connector's configuration page.  Its purpose is to present the required form elements for editing.
@@ -111,7 +111,7 @@ public interface IConnector
   *@param tabName is the current tab name.
   */
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
-    throws LCFException, IOException;
+    throws ACFException, IOException;
   
   /** Process a configuration post.
   * This method is called at the start of the authority connector's configuration page, whenever there is a possibility that form data for a connection has been
@@ -123,7 +123,7 @@ public interface IConnector
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
-    throws LCFException;
+    throws ACFException;
   
   /** View configuration.
   * This method is called in the body section of the authority connector's view configuration page.  Its purpose is to present the connection information to the user.
@@ -133,6 +133,6 @@ public interface IConnector
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
-    throws LCFException, IOException;
+    throws ACFException, IOException;
 
 }
\ No newline at end of file

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDBInterface.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDBInterface.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDBInterface.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDBInterface.java Mon Aug 23 18:08:32 2010
@@ -43,13 +43,13 @@ public interface IDBInterface
   * database communication.
   */
   public void openDatabase()
-    throws LCFException;
+    throws ACFException;
   
   /** Uninitialize.  This method is called during JVM shutdown, in order to close
   * all database communication.
   */
   public void closeDatabase()
-    throws LCFException;
+    throws ACFException;
   
   /** Get the database name.
   *@return the database name.
@@ -70,7 +70,7 @@ public interface IDBInterface
   *@param tableName is the name of the table.
   */
   public void performLock(String tableName)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform an insert operation.
   *@param tableName is the name of the table.
@@ -79,7 +79,7 @@ public interface IDBInterface
   *@param parameterMap is the map of column name/values to write.
   */
   public void performInsert(String tableName, Map parameterMap, StringSet invalidateKeys)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform an update operation.
   *@param tableName is the name of the table.
@@ -89,7 +89,7 @@ public interface IDBInterface
   *@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 LCFException;
+    throws ACFException;
 
   /** Perform a delete operation.
   *@param tableName is the name of the table to delete from.
@@ -98,7 +98,7 @@ public interface IDBInterface
   *@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 LCFException;
+    throws ACFException;
 
   /** Perform a table creation operation.
   *@param tableName is the name of the table to create.
@@ -108,7 +108,7 @@ public interface IDBInterface
   *@param invalidateKeys are the cache keys that should be invalidated, if any.
   */
   public void performCreate(String tableName, Map columnMap, StringSet invalidateKeys)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform a table alter operation.
   *@param tableName is the name of the table to alter.
@@ -122,7 +122,7 @@ public interface IDBInterface
   */
   public void performAlter(String tableName, Map columnMap, Map columnModifyMap, ArrayList columnDeleteList,
     StringSet invalidateKeys)
-    throws LCFException;
+    throws ACFException;
 
   /** Add an index to a table.
   *@param tableName is the name of the table to add the index for.
@@ -131,7 +131,7 @@ public interface IDBInterface
   * in the index, in order.
   */
   public void addTableIndex(String tableName, boolean unique, ArrayList columnList)
-    throws LCFException;
+    throws ACFException;
 
   /** Add an index to a table.
   *@param tableName is the name of the table to add the index for.
@@ -139,32 +139,32 @@ public interface IDBInterface
   *@param description is the index description.
   */
   public void performAddIndex(String indexName, String tableName, IndexDescription description)
-    throws LCFException;
+    throws ACFException;
 
   /** Remove an index.
   *@param indexName is the name of the index to remove.
   */
   public void performRemoveIndex(String indexName)
-    throws LCFException;
+    throws ACFException;
 
   /** Analyze a table.
   *@param tableName is the name of the table to analyze/calculate statistics for.
   */
   public void analyzeTable(String tableName)
-    throws LCFException;
+    throws ACFException;
 
   /** Reindex a table.
   *@param tableName is the name of the table to rebuild indexes for.
   */
   public void reindexTable(String tableName)
-    throws LCFException;
+    throws ACFException;
 
   /** 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 LCFException;
+    throws ACFException;
 
   /** Create user and database.
   *@param adminUserName is the admin user name.
@@ -172,7 +172,7 @@ public interface IDBInterface
   *@param invalidateKeys are the cache keys that should be invalidated, if any.
   */
   public void createUserAndDatabase(String adminUserName, String adminPassword, StringSet invalidateKeys)
-    throws LCFException;
+    throws ACFException;
 
   /** Drop user and database.
   *@param adminUserName is the admin user name.
@@ -180,7 +180,7 @@ public interface IDBInterface
   *@param invalidateKeys are the cache keys that should be invalidated, if any.
   */
   public void dropUserAndDatabase(String adminUserName, String adminPassword, StringSet invalidateKeys)
-    throws LCFException;
+    throws ACFException;
     
   /** Get a table's schema.
   *@param tableName is the name of the table.
@@ -189,7 +189,7 @@ public interface IDBInterface
   *@return a map of column names and ColumnDescription objects, describing the schema.
   */
   public Map getTableSchema(String tableName, StringSet cacheKeys, String queryClass)
-    throws LCFException;
+    throws ACFException;
 
   /** Get a table's indexes.
   *@param tableName is the name of the table.
@@ -198,7 +198,7 @@ public interface IDBInterface
   *@return a map of index names and IndexDescription objects, describing the indexes.
   */
   public Map getTableIndexes(String tableName, StringSet cacheKeys, String queryClass)
-    throws LCFException;
+    throws ACFException;
 
   /** Get a database's tables.
   *@param cacheKeys are the cache keys for the query, or null.
@@ -206,7 +206,7 @@ public interface IDBInterface
   *@return the set of tables.
   */
   public StringSet getAllTables(StringSet cacheKeys, String queryClass)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform a general database modification query.
   *@param query is the query string.
@@ -214,7 +214,7 @@ public interface IDBInterface
   *@param invalidateKeys are the cache keys to invalidate.
   */
   public void performModification(String query, ArrayList params, StringSet invalidateKeys)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform a general "data fetch" query.
   *@param query is the query string.
@@ -225,7 +225,7 @@ public interface IDBInterface
   *@return a resultset.
   */
   public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform a general "data fetch" query.
   *@param query is the query string.
@@ -239,7 +239,7 @@ public interface IDBInterface
   */
   public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
     int maxResults, ILimitChecker returnLimit)
-    throws LCFException;
+    throws ACFException;
 
   /** Perform a general "data fetch" query.
   *@param query is the query string.
@@ -254,7 +254,7 @@ public interface IDBInterface
   */
   public IResultSet performQuery(String query, ArrayList params, StringSet cacheKeys, String queryClass,
     int maxResults, ResultSpecification resultSpec, ILimitChecker returnLimit)
-    throws LCFException;
+    throws ACFException;
 
   /** Construct a regular-expression match clause.
   * This method builds both the text part of a regular-expression match.
@@ -307,7 +307,7 @@ public interface IDBInterface
   * if not otherwise determined).
   */
   public void beginTransaction()
-    throws LCFException;
+    throws ACFException;
 
   /** 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 @@ public interface IDBInterface
   *@param transactionType is the kind of transaction desired.
   */
   public void beginTransaction(int transactionType)
-    throws LCFException;
+    throws ACFException;
 
   /** Signal that a rollback should occur on the next endTransaction().
   */
@@ -329,7 +329,7 @@ public interface IDBInterface
   * signalRollback() was called within the transaction).
   */
   public void endTransaction()
-    throws LCFException;
+    throws ACFException;
 
 }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDFactory.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IDFactory.java Mon Aug 23 18:08:32 2010
@@ -18,7 +18,7 @@
 */
 package org.apache.acf.core.interfaces;
 
-import org.apache.acf.core.system.LCF;
+import org.apache.acf.core.system.ACF;
 import org.apache.acf.core.system.Logging;
 import java.io.*;
 import java.util.*;
@@ -48,7 +48,7 @@ public class IDFactory
   }
 
   public static String make(IThreadContext tc)
-    throws LCFException
+    throws ACFException
   {
     ILockManager lockManager = LockManagerFactory.make(tc);
     // Enter critical section before we look at the pool
@@ -87,7 +87,7 @@ public class IDFactory
         }
         catch (UnsupportedEncodingException e)
         {
-          throw new LCFException(e.getMessage(),e);
+          throw new ACFException(e.getMessage(),e);
         }
         finally
         {

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IKeystoreManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IKeystoreManager.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IKeystoreManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IKeystoreManager.java Mon Aug 23 18:08:32 2010
@@ -22,7 +22,7 @@ import java.io.*;
 
 /** 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 LCF java environment.
+* to work well within the ACF java environment.
 */
 public interface IKeystoreManager
 {
@@ -32,48 +32,48 @@ public interface IKeystoreManager
   *@return the list, as a string array.
   */
   public String[] getContents()
-    throws LCFException;
+    throws ACFException;
 
   /** 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 LCFException;
+    throws ACFException;
 
   /** 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 LCFException;
+    throws ACFException;
 
   /** Remove a certificate.
   *@param alias is the name of the certificate to remove.
   */
   public void remove(String alias)
-    throws LCFException;
+    throws ACFException;
 
   /** Convert to a base64 string.
   *@return the base64-encoded string.
   */
   public String getString()
-    throws LCFException;
+    throws ACFException;
 
   /** Read a certificate from the keystore.
   */
   public java.security.cert.Certificate getCertificate(String alias)
-    throws LCFException;
+    throws ACFException;
 
   /** Add a certificate to the keystore.
   */
   public void addCertificate(String alias, java.security.cert.Certificate certificate)
-    throws LCFException;
+    throws ACFException;
 
   /** Build a secure socket factory based on this keystore.
   */
   public javax.net.ssl.SSLSocketFactory getSecureSocketFactory()
-    throws LCFException;
+    throws ACFException;
 
 
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILimitChecker.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILimitChecker.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILimitChecker.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILimitChecker.java Mon Aug 23 18:08:32 2010
@@ -61,11 +61,11 @@ public interface ILimitChecker
   *@return true if it should be included, false otherwise.
   */
   public boolean checkInclude(IResultRow row)
-    throws LCFException;
+    throws ACFException;
 
   /** 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 LCFException;
+    throws ACFException;
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILockManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILockManager.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILockManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/ILockManager.java Mon Aug 23 18:08:32 2010
@@ -31,20 +31,20 @@ public interface ILockManager
   *@param flagName is the name of the flag to set.
   */
   public void setGlobalFlag(String flagName)
-    throws LCFException;
+    throws ACFException;
 
   /** Clear a flag.  Use this method to clear a condition, or retract a global signal.
   *@param flagName is the name of the flag to clear.
   */
   public void clearGlobalFlag(String flagName)
-    throws LCFException;
+    throws ACFException;
   
   /** Check the condition of a specified flag.
   *@param flagName is the name of the flag to check.
   *@return true if the flag is set, false otherwise.
   */
   public boolean checkGlobalFlag(String flagName)
-    throws LCFException;
+    throws ACFException;
 
   /** Read data from a shared data resource.  Use this method to read any existing data, or get a null back if there is no such resource.
   * Note well that this is not necessarily an atomic operation, and it must thus be protected by a lock.
@@ -52,7 +52,7 @@ public interface ILockManager
   *@return a byte array containing the data, or null.
   */
   public byte[] readData(String resourceName)
-    throws LCFException;
+    throws ACFException;
   
   /** Write data to a shared data resource.  Use this method to write a body of data into a shared resource.
   * Note well that this is not necessarily an atomic operation, and it must thus be protected by a lock.
@@ -60,7 +60,7 @@ public interface ILockManager
   *@param data is the byte array containing the data.  Pass null if you want to delete the resource completely.
   */
   public void writeData(String resourceName, byte[] data)
-    throws LCFException;
+    throws ACFException;
 
   /** Wait for a time before retrying a lock.  Use this method to wait
   * after a LockException has been thrown.  )If this is not done, the application
@@ -70,7 +70,7 @@ public interface ILockManager
   * thread.
   */
   public void timedWait(int time)
-    throws LCFException;
+    throws ACFException;
 
   /** 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
@@ -79,7 +79,7 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void enterWriteLock(String lockKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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.
@@ -89,14 +89,14 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void enterWriteLockNoWait(String lockKey)
-    throws LCFException, LockException;
+    throws ACFException, 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 LCFException;
+    throws ACFException;
 
   /** 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
@@ -107,7 +107,7 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void enterNonExWriteLock(String lockKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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
@@ -118,7 +118,7 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void enterNonExWriteLockNoWait(String lockKey)
-    throws LCFException, LockException;
+    throws ACFException, LockException;
 
   /** Leave a non-exclusive write locked code area.  Use this method to exit a non-ex-write-locked section.
   * The lockKey
@@ -126,7 +126,7 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void leaveNonExWriteLock(String lockKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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
@@ -135,7 +135,7 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void enterReadLock(String lockKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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
@@ -144,14 +144,14 @@ public interface ILockManager
   *@param lockKey is the name of the lock.
   */
   public void enterReadLockNoWait(String lockKey)
-    throws LCFException, LockException;
+    throws ACFException, 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 LCFException;
+    throws ACFException;
 
   /** 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
@@ -162,7 +162,7 @@ public interface ILockManager
   *@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 LCFException;
+    throws ACFException;
 
   /** 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
@@ -173,7 +173,7 @@ public interface ILockManager
   *@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 LCFException, LockException;
+    throws ACFException, 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.
@@ -182,13 +182,13 @@ public interface ILockManager
   *@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 LCFException;
+    throws ACFException;
 
   /** Clear all outstanding locks in the system.
   * This is a very dangerous method to use (obviously)...
   */
   public void clearLocks()
-    throws LCFException;
+    throws ACFException;
 
   /** 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.
@@ -196,7 +196,7 @@ public interface ILockManager
   * section at a time.
   */
   public void enterReadCriticalSection(String sectionKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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.
@@ -204,7 +204,7 @@ public interface ILockManager
   * section at a time.
   */
   public void leaveReadCriticalSection(String sectionKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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.
@@ -212,7 +212,7 @@ public interface ILockManager
   * section at a time.
   */
   public void enterNonExWriteCriticalSection(String sectionKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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.
@@ -220,7 +220,7 @@ public interface ILockManager
   * section at a time.
   */
   public void leaveNonExWriteCriticalSection(String sectionKey)
-    throws LCFException;
+    throws ACFException;
 
 
   /** Enter a named, exclusive write critical section (NOT a lock).  Critical sections never cross JVM boundaries.
@@ -229,7 +229,7 @@ public interface ILockManager
   * section at a time.
   */
   public void enterWriteCriticalSection(String sectionKey)
-    throws LCFException;
+    throws ACFException;
 
   /** 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.
@@ -237,7 +237,7 @@ public interface ILockManager
   * section at a time.
   */
   public void leaveWriteCriticalSection(String sectionKey)
-    throws LCFException;
+    throws ACFException;
 
   /** Enter multiple critical sections simultaneously.
   *@param readSectionKeys is an array of read section descriptors, or null if there are no read sections desired.
@@ -245,7 +245,7 @@ public interface ILockManager
   *@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 LCFException;
+    throws ACFException;
 
   /** Leave multiple critical sections simultaneously.
   *@param readSectionKeys is an array of read section descriptors, or null if there are no read sections desired.
@@ -253,6 +253,6 @@ public interface ILockManager
   *@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 LCFException;
+    throws ACFException;
 
 }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IPostParameters.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IPostParameters.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IPostParameters.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IPostParameters.java Mon Aug 23 18:08:32 2010
@@ -43,7 +43,7 @@ public interface IPostParameters
   *@return the value, or null if it doesn't exist.
   */
   public BinaryInput getBinaryStream(String name)
-    throws LCFException;
+    throws ACFException;
   
   /** Get file parameter, as a byte array.
   *@param name is the parameter name.

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IShutdownHook.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IShutdownHook.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IShutdownHook.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/IShutdownHook.java Mon Aug 23 18:08:32 2010
@@ -24,6 +24,6 @@ public interface IShutdownHook
   /** Do the requisite cleanup.
   */
   public void doCleanup()
-    throws LCFException;
+    throws ACFException;
 }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/KeystoreManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/KeystoreManagerFactory.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/KeystoreManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/KeystoreManagerFactory.java Mon Aug 23 18:08:32 2010
@@ -31,7 +31,7 @@ public class KeystoreManagerFactory
   /** Mint a keystore manager.
   */
   public static IKeystoreManager make(String passcode)
-    throws LCFException
+    throws ACFException
   {
     return new KeystoreManager(passcode);
   }
@@ -39,7 +39,7 @@ public class KeystoreManagerFactory
   /** Mint a keystore manager from a base-64 encoded string.
   */
   public static IKeystoreManager make(String passcode, String base64String)
-    throws LCFException
+    throws ACFException
   {
     return new KeystoreManager(passcode,base64String);
   }
@@ -49,7 +49,7 @@ public class KeystoreManagerFactory
   /** 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 LCFException
+    throws ACFException
   {
     try
     {
@@ -63,11 +63,11 @@ public class KeystoreManagerFactory
     }
     catch (java.security.NoSuchAlgorithmException e)
     {
-      throw new LCFException("No such algorithm: "+e.getMessage(),e);
+      throw new ACFException("No such algorithm: "+e.getMessage(),e);
     }
     catch (java.security.KeyManagementException e)
     {
-      throw new LCFException("Key management exception: "+e.getMessage(),e);
+      throw new ACFException("Key management exception: "+e.getMessage(),e);
     }
   }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/LockManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/LockManagerFactory.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/LockManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/LockManagerFactory.java Mon Aug 23 18:08:32 2010
@@ -18,7 +18,7 @@
 */
 package org.apache.acf.core.interfaces;
 
-import org.apache.acf.core.system.LCF;
+import org.apache.acf.core.system.ACF;
 
 public class LockManagerFactory
 {
@@ -35,12 +35,12 @@ public class LockManagerFactory
   * thread).
   */
   public static ILockManager make(IThreadContext context)
-    throws LCFException
+    throws ACFException
   {
     Object x = context.get(lockManager);
     if (x == null || !(x instanceof ILockManager))
     {
-      String implementationClass = LCF.getProperty(LCF.lockManagerImplementation);
+      String implementationClass = ACF.getProperty(ACF.lockManagerImplementation);
       if (implementationClass == null)
         implementationClass = "org.apache.acf.core.lockmanager.LockManager";
       try
@@ -48,28 +48,28 @@ public class LockManagerFactory
         Class c = Class.forName(implementationClass);
         x = c.newInstance();
         if (!(x instanceof ILockManager))
-          throw new LCFException("Lock manager class "+implementationClass+" does not implement ILockManager",LCFException.SETUP_ERROR);
+          throw new ACFException("Lock manager class "+implementationClass+" does not implement ILockManager",ACFException.SETUP_ERROR);
         context.save(lockManager,x);
       }
       catch (ClassNotFoundException e)
       {
-        throw new LCFException("Lock manager class "+implementationClass+" could not be found: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Lock manager class "+implementationClass+" could not be found: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (ExceptionInInitializerError e)
       {
-        throw new LCFException("Lock manager class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Lock manager class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (LinkageError e)
       {
-        throw new LCFException("Lock manager class "+implementationClass+" could not be linked: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Lock manager class "+implementationClass+" could not be linked: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (InstantiationException e)
       {
-        throw new LCFException("Lock manager class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Lock manager class "+implementationClass+" could not be instantiated: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
       catch (IllegalAccessException e)
       {
-        throw new LCFException("Lock manager class "+implementationClass+" had no public default initializer: "+e.getMessage(),e,LCFException.SETUP_ERROR);
+        throw new ACFException("Lock manager class "+implementationClass+" had no public default initializer: "+e.getMessage(),e,ACFException.SETUP_ERROR);
       }
     }
     return (ILockManager)x;

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Specification.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Specification.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Specification.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/Specification.java Mon Aug 23 18:08:32 2010
@@ -39,7 +39,7 @@ public class Specification extends Confi
   *@param xml is the input XML.
   */
   public Specification(String xml)
-    throws LCFException
+    throws ACFException
   {
     super("specification");
     fromXML(xml);

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileCharacterInput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileCharacterInput.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileCharacterInput.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileCharacterInput.java Mon Aug 23 18:08:32 2010
@@ -19,7 +19,7 @@
 package org.apache.acf.core.interfaces;
 
 import java.io.*;
-import org.apache.acf.core.system.LCF;
+import org.apache.acf.core.system.ACF;
 
 /** This class represents a temporary file character input
 * stream.  Call the "done" method to clean up the
@@ -42,7 +42,7 @@ public class TempFileCharacterInput exte
   *          and hash value for the data.
   */
   public TempFileCharacterInput(Reader is)
-    throws LCFException
+    throws ACFException
   {
     super();
     try
@@ -52,12 +52,12 @@ public class TempFileCharacterInput exte
       try
       {
         // Register the file for autodeletion, using our infrastructure.
-        LCF.addFile(outfile);
+        ACF.addFile(outfile);
         // deleteOnExit() causes memory leakage!
         // outfile.deleteOnExit();
 
         // Set up hash digest and character length counter before we start anything.
-        java.security.MessageDigest md = LCF.startHash();
+        java.security.MessageDigest md = ACF.startHash();
 
         FileOutputStream outStream = new FileOutputStream(outfile);
         // Create a Writer corresponding to the file output stream, and encode using utf-8
@@ -74,12 +74,12 @@ public class TempFileCharacterInput exte
             if (readsize == -1)
               break;
             outWriter.write(buffer,0,readsize);
-            LCF.addToHash(md,new String(buffer,0,readsize));
+            ACF.addToHash(md,new String(buffer,0,readsize));
             totalMoved += readsize;
           }
 
           charLength = totalMoved;
-          hashValue = LCF.getHashValue(md);
+          hashValue = ACF.getHashValue(md);
         }
         finally
         {
@@ -95,7 +95,7 @@ public class TempFileCharacterInput exte
       {
         // Delete the temp file we created on any error condition
         // outfile.delete();
-        LCF.deleteFile(outfile);
+        ACF.deleteFile(outfile);
         if (e instanceof Error)
           throw (Error)e;
         if (e instanceof RuntimeException)
@@ -107,11 +107,11 @@ public class TempFileCharacterInput exte
     }
     catch (InterruptedIOException e)
     {
-      throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
+      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
     }
     catch (Exception e)
     {
-      throw new LCFException("Cannot write temporary file: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
+      throw new ACFException("Cannot write temporary file: "+e.getMessage(),e,ACFException.GENERAL_ERROR);
     }
 
   }
@@ -123,7 +123,7 @@ public class TempFileCharacterInput exte
   {
     super();
     file = tempFile;
-    LCF.addFile(file);
+    ACF.addFile(file);
     // deleteOnExit() causes memory leakage; better to leak files on hard shutdown than memory.
     // file.deleteOnExit();
   }
@@ -135,7 +135,7 @@ public class TempFileCharacterInput exte
 
   /** Open a Utf8 stream directly from the backing file */
   public InputStream getUtf8Stream()
-    throws LCFException
+    throws ACFException
   {
     if (file != null)
     {
@@ -145,14 +145,14 @@ public class TempFileCharacterInput exte
       }
       catch (FileNotFoundException e)
       {
-        throw new LCFException("No such file: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
+        throw new ACFException("No such file: "+e.getMessage(),e,ACFException.GENERAL_ERROR);
       }
     }
     return null;
   }
 
   protected void openStream()
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -162,11 +162,11 @@ public class TempFileCharacterInput exte
     }
     catch (FileNotFoundException e)
     {
-      throw new LCFException("Can't create stream: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
+      throw new ACFException("Can't create stream: "+e.getMessage(),e,ACFException.GENERAL_ERROR);
     }
     catch (UnsupportedEncodingException e)
     {
-      throw new LCFException("Can't create stream: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
+      throw new ACFException("Can't create stream: "+e.getMessage(),e,ACFException.GENERAL_ERROR);
     }
   }
 
@@ -187,33 +187,33 @@ public class TempFileCharacterInput exte
   }
 
   public void discard()
-    throws LCFException
+    throws ACFException
   {
     super.discard();
     // Delete the underlying file
     if (file != null)
     {
-      LCF.deleteFile(file);
+      ACF.deleteFile(file);
       file = null;
     }
   }
 
   /** Calculate the datum's length in characters */
   protected void calculateLength()
-    throws LCFException
+    throws ACFException
   {
     scanFile();
   }
 
   /** Calculate the datum's hash value */
   protected void calculateHashValue()
-    throws LCFException
+    throws ACFException
   {
     scanFile();
   }
 
   private void scanFile()
-    throws LCFException
+    throws ACFException
   {
     // Scan the file in order to figure out the hash value and the character length
     try
@@ -224,7 +224,7 @@ public class TempFileCharacterInput exte
       try
       {
         // Set up hash digest and character length counter before we start anything.
-        java.security.MessageDigest md = LCF.startHash();
+        java.security.MessageDigest md = ACF.startHash();
         char[] buffer = new char[CHUNK_SIZE];
         long totalMoved = 0;
         while (true)
@@ -234,12 +234,12 @@ public class TempFileCharacterInput exte
           int readsize = reader.read(buffer,0,moveAmount);
           if (readsize == -1)
             break;
-          LCF.addToHash(md,new String(buffer,0,readsize));
+          ACF.addToHash(md,new String(buffer,0,readsize));
           totalMoved += readsize;
         }
 
         charLength = totalMoved;
-        hashValue = LCF.getHashValue(md);
+        hashValue = ACF.getHashValue(md);
       }
       finally
       {
@@ -248,11 +248,11 @@ public class TempFileCharacterInput exte
     }
     catch (InterruptedIOException e)
     {
-      throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
+      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new LCFException("Can't scan file: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
+      throw new ACFException("Can't scan file: "+e.getMessage(),e,ACFException.GENERAL_ERROR);
     }
   }
 

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileInput.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileInput.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileInput.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/interfaces/TempFileInput.java Mon Aug 23 18:08:32 2010
@@ -19,7 +19,7 @@
 package org.apache.acf.core.interfaces;
 
 import java.io.*;
-import org.apache.acf.core.system.LCF;
+import org.apache.acf.core.system.ACF;
 
 /** This class represents a temporary file data input
 * stream.  Call the "done" method to clean up the
@@ -42,7 +42,7 @@ public class TempFileInput extends Binar
   *@param is is the input stream to use to construct the temporary file.
   */
   public TempFileInput(InputStream is)
-    throws LCFException
+    throws ACFException
   {
     this(is,-1L);
   }
@@ -52,7 +52,7 @@ public class TempFileInput extends Binar
   *@param length is the maximum number of bytes to transfer, or -1 if no limit.
   */
   public TempFileInput(InputStream is, long length)
-    throws LCFException
+    throws ACFException
   {
     super();
     try
@@ -62,7 +62,7 @@ public class TempFileInput extends Binar
       try
       {
         // Register the file for autodeletion, using our infrastructure.
-        LCF.addFile(outfile);
+        ACF.addFile(outfile);
         // deleteOnExit() causes memory leakage!
         // outfile.deleteOnExit();
         FileOutputStream outStream = new FileOutputStream(outfile);
@@ -103,7 +103,7 @@ public class TempFileInput extends Binar
       {
         // Delete the temp file we created on any error condition
         // outfile.delete();
-        LCF.deleteFile(outfile);
+        ACF.deleteFile(outfile);
         if (e instanceof Error)
           throw (Error)e;
         if (e instanceof RuntimeException)
@@ -115,11 +115,11 @@ public class TempFileInput extends Binar
     }
     catch (InterruptedIOException e)
     {
-      throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
+      throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
     }
     catch (Exception e)
     {
-      throw new LCFException("Cannot write temporary file",e,LCFException.GENERAL_ERROR);
+      throw new ACFException("Cannot write temporary file",e,ACFException.GENERAL_ERROR);
     }
 
   }
@@ -131,7 +131,7 @@ public class TempFileInput extends Binar
   {
     super();
     file = tempFile;
-    LCF.addFile(file);
+    ACF.addFile(file);
     // deleteOnExit() causes memory leakage; better to leak files on hard shutdown than memory.
     // file.deleteOnExit();
   }
@@ -155,18 +155,18 @@ public class TempFileInput extends Binar
   }
 
   public void discard()
-    throws LCFException
+    throws ACFException
   {
     super.discard();
     if (file != null)
     {
-      LCF.deleteFile(file);
+      ACF.deleteFile(file);
       file = null;
     }
   }
 
   protected void openStream()
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -175,12 +175,12 @@ public class TempFileInput extends Binar
     }
     catch (FileNotFoundException e)
     {
-      throw new LCFException("Can't create stream: "+e.getMessage(),e,LCFException.GENERAL_ERROR);
+      throw new ACFException("Can't create stream: "+e.getMessage(),e,ACFException.GENERAL_ERROR);
     }
   }
 
   protected void calculateLength()
-    throws LCFException
+    throws ACFException
   {
     this.length = file.length();
   }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/keystore/KeystoreManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/keystore/KeystoreManager.java?rev=988237&r1=988236&r2=988237&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/keystore/KeystoreManager.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/acf/core/keystore/KeystoreManager.java Mon Aug 23 18:08:32 2010
@@ -29,7 +29,7 @@ import java.io.*;
 
 /** 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 LCF java environment.
+* to work well within the ACF java environment.
 */
 public class KeystoreManager implements IKeystoreManager
 {
@@ -43,7 +43,7 @@ public class KeystoreManager implements 
   /** Create the keystore object.
   */
   public KeystoreManager(String passcode)
-    throws LCFException
+    throws ACFException
   {
     this.passcode = passcode;
     try
@@ -53,30 +53,30 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore exception: "+e.getMessage(),e);
+      throw new ACFException("Keystore exception: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
-      throw new LCFException("Interrupted IO: "+e.getMessage(),e,LCFException.INTERRUPTED);
+      throw new ACFException("Interrupted IO: "+e.getMessage(),e,ACFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new LCFException("IO error creating keystore: "+e.getMessage(),e);
+      throw new ACFException("IO error creating keystore: "+e.getMessage(),e);
     }
     catch (NoSuchAlgorithmException e)
     {
-      throw new LCFException("Unknown algorithm exception creating keystore: "+e.getMessage(),e);
+      throw new ACFException("Unknown algorithm exception creating keystore: "+e.getMessage(),e);
     }
     catch (CertificateException e)
     {
-      throw new LCFException("Unknown certificate exception creating keystore: "+e.getMessage(),e);
+      throw new ACFException("Unknown certificate exception creating keystore: "+e.getMessage(),e);
     }
   }
 
   /** Create the keystore object from an existing base 64 string.
   */
   public KeystoreManager(String passcode, String base64String)
-    throws LCFException
+    throws ACFException
   {
     this.passcode = passcode;
     try
@@ -95,23 +95,23 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore exception: "+e.getMessage(),e);
+      throw new ACFException("Keystore exception: "+e.getMessage(),e);
     }
     catch (InterruptedIOException e)
     {
-      throw new LCFException("Interrupted IO: "+e.getMessage(),e,LCFException.INTERRUPTED);
+      throw new ACFException("Interrupted IO: "+e.getMessage(),e,ACFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new LCFException("IO error creating keystore: "+e.getMessage(),e);
+      throw new ACFException("IO error creating keystore: "+e.getMessage(),e);
     }
     catch (NoSuchAlgorithmException e)
     {
-      throw new LCFException("Unknown algorithm exception creating keystore: "+e.getMessage(),e);
+      throw new ACFException("Unknown algorithm exception creating keystore: "+e.getMessage(),e);
     }
     catch (CertificateException e)
     {
-      throw new LCFException("Unknown certificate exception creating keystore: "+e.getMessage(),e);
+      throw new ACFException("Unknown certificate exception creating keystore: "+e.getMessage(),e);
     }
   }
 
@@ -119,7 +119,7 @@ public class KeystoreManager implements 
   *@return the list, as a string array.
   */
   public String[] getContents()
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -135,7 +135,7 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore not initialized: "+e.getMessage(),e);
+      throw new ACFException("Keystore not initialized: "+e.getMessage(),e);
     }
 
   }
@@ -146,7 +146,7 @@ public class KeystoreManager implements 
   *@return a description of what's in the alias.
   */
   public String getDescription(String alias)
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -157,7 +157,7 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore not initialized: "+e.getMessage(),e);
+      throw new ACFException("Keystore not initialized: "+e.getMessage(),e);
     }
   }
 
@@ -166,7 +166,7 @@ public class KeystoreManager implements 
   *@param certData is the binary data for the certificate.
   */
   public void importCertificate(String alias, InputStream certData)
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -183,18 +183,18 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore exception: "+e.getMessage(),e);
+      throw new ACFException("Keystore exception: "+e.getMessage(),e);
     }
     catch (CertificateException e)
     {
-      throw new LCFException("Certificate error: "+e.getMessage(),e);
+      throw new ACFException("Certificate error: "+e.getMessage(),e);
     }
   }
 
   /** Read a certificate from the keystore.
   */
   public java.security.cert.Certificate getCertificate(String alias)
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -202,14 +202,14 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore exception: "+e.getMessage(),e);
+      throw new ACFException("Keystore exception: "+e.getMessage(),e);
     }
   }
 
   /** Add a certificate to the keystore.
   */
   public void addCertificate(String alias, java.security.cert.Certificate certificate)
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -224,7 +224,7 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Keystore exception: "+e.getMessage(),e);
+      throw new ACFException("Keystore exception: "+e.getMessage(),e);
     }
   }
 
@@ -232,7 +232,7 @@ public class KeystoreManager implements 
   *@param alias is the name of the certificate to remove.
   */
   public void remove(String alias)
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -240,7 +240,7 @@ public class KeystoreManager implements 
     }
     catch (KeyStoreException e)
     {
-      throw new LCFException("Error deleting keystore entry",e);
+      throw new ACFException("Error deleting keystore entry",e);
     }
   }
 
@@ -248,7 +248,7 @@ public class KeystoreManager implements 
   *@return the base64-encoded string.
   */
   public String getString()
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -260,23 +260,23 @@ public class KeystoreManager implements 
       }
       catch (KeyStoreException e)
       {
-        throw new LCFException("Error accessing keystore: "+e.getMessage(),e);
+        throw new ACFException("Error accessing keystore: "+e.getMessage(),e);
       }
       catch (InterruptedIOException e)
       {
-        throw new LCFException("Interrupted IO: "+e.getMessage(),e,LCFException.INTERRUPTED);
+        throw new ACFException("Interrupted IO: "+e.getMessage(),e,ACFException.INTERRUPTED);
       }
       catch (IOException e)
       {
-        throw new LCFException("IO error saving keystore: "+e.getMessage(),e);
+        throw new ACFException("IO error saving keystore: "+e.getMessage(),e);
       }
       catch (NoSuchAlgorithmException e)
       {
-        throw new LCFException("Unknown algorithm exception saving keystore: "+e.getMessage(),e);
+        throw new ACFException("Unknown algorithm exception saving keystore: "+e.getMessage(),e);
       }
       catch (CertificateException e)
       {
-        throw new LCFException("Certificate exception saving keystore: "+e.getMessage(),e);
+        throw new ACFException("Certificate exception saving keystore: "+e.getMessage(),e);
       }
       finally
       {
@@ -285,18 +285,18 @@ public class KeystoreManager implements 
     }
     catch (InterruptedIOException e)
     {
-      throw new LCFException("Interrupted IO: "+e.getMessage(),e,LCFException.INTERRUPTED);
+      throw new ACFException("Interrupted IO: "+e.getMessage(),e,ACFException.INTERRUPTED);
     }
     catch (IOException e)
     {
-      throw new LCFException("IO exception storing keystore: "+e.getMessage(),e);
+      throw new ACFException("IO exception storing keystore: "+e.getMessage(),e);
     }
   }
 
   /** Build a secure socket factory based on this keystore.
   */
   public javax.net.ssl.SSLSocketFactory getSecureSocketFactory()
-    throws LCFException
+    throws ACFException
   {
     try
     {
@@ -358,15 +358,15 @@ public class KeystoreManager implements 
     }
     catch (java.security.NoSuchAlgorithmException e)
     {
-      throw new LCFException("No such algorithm: "+e.getMessage(),e);
+      throw new ACFException("No such algorithm: "+e.getMessage(),e);
     }
     catch (java.security.KeyStoreException e)
     {
-      throw new LCFException("Keystore exception: "+e.getMessage(),e);
+      throw new ACFException("Keystore exception: "+e.getMessage(),e);
     }
     catch (java.security.KeyManagementException e)
     {
-      throw new LCFException("Key management exception: "+e.getMessage(),e);
+      throw new ACFException("Key management exception: "+e.getMessage(),e);
     }
   }
 



Mime
View raw message