incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r911029 [2/19] - in /incubator/lcf/trunk: modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/ modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/ modules/connectors/documentum/crawler...
Date Wed, 17 Feb 2010 15:57:35 GMT
Modified: incubator/lcf/trunk/modules/connectors/filesystem/connector/org/apache/lcf/crawler/connectors/filesystem/FileConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filesystem/connector/org/apache/lcf/crawler/connectors/filesystem/FileConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filesystem/connector/org/apache/lcf/crawler/connectors/filesystem/FileConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/filesystem/connector/org/apache/lcf/crawler/connectors/filesystem/FileConnector.java Wed Feb 17 15:57:27 2010
@@ -105,7 +105,7 @@
 	*@return the document uri.
 	*/
 	protected String convertToURI(String documentIdentifier)
-		throws MetacartaException
+		throws LCFException
 	{
 		//
 		// Note well:  This MUST be a legal URI!!!
@@ -115,7 +115,7 @@
 		}
 		catch (java.io.IOException e)
 		{
-			throw new MetacartaException("Bad url",e);
+			throw new LCFException("Bad url",e);
 		}
 	}
 
@@ -133,7 +133,7 @@
 	*@return the stream of local document identifiers that should be added to the queue.
 	*/
 	public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec, long startTime, long endTime)
-		throws MetacartaException
+		throws LCFException
 	{
 		return new IdentifierStream(spec);
 	}
@@ -148,7 +148,7 @@
 	* will always be processed.
 	*/
 	public String[] getDocumentVersions(String[] documentIdentifiers, DocumentSpecification spec)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		String[] rval = new String[documentIdentifiers.length];
 		int i = 0;
@@ -198,7 +198,7 @@
 	* should only find other references, and should not actually call the ingestion methods.
 	*/
 	public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		int i = 0;
 		while (i < documentIdentifiers.length)
@@ -235,7 +235,7 @@
 						{
 							errorCode = "IO ERROR";
 							errorDesc = e.getMessage();
-							throw new MetacartaException("IO Error: "+e.getMessage(),e);
+							throw new LCFException("IO Error: "+e.getMessage(),e);
 						}
 					}
 					finally
@@ -283,7 +283,7 @@
 								{
 									errorCode = "IO ERROR";
 									errorDesc = e.getMessage();
-									throw new MetacartaException("IO Error: "+e.getMessage(),e);
+									throw new LCFException("IO Error: "+e.getMessage(),e);
 								}
 							}
 							finally
@@ -308,7 +308,7 @@
 	*@return true if it should be included.
 	*/
 	protected static boolean checkInclude(File file, String fileName, DocumentSpecification documentSpecification)
-		throws MetacartaException
+		throws LCFException
 	{
 	    if (Logging.connectors.isDebugEnabled())
 	    {
@@ -403,7 +403,7 @@
 	    }
 	    catch (IOException e)
 	    {
-		throw new MetacartaException("IO Error",e);
+		throw new LCFException("IO Error",e);
 	    }
 	}
 
@@ -413,7 +413,7 @@
 	*@param documentSpecification is the specification.
 	*/
 	protected static boolean checkIngest(File file, DocumentSpecification documentSpecification)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Since the only exclusions at this point are not based on file contents, this is a no-op.
 		// MHL
@@ -527,7 +527,7 @@
 		protected int currentIndex = 0;
 
 		public IdentifierStream(DocumentSpecification spec)
-			throws MetacartaException
+			throws LCFException
 		{
 		    try
 		    {
@@ -563,7 +563,7 @@
 		    }
 		    catch (IOException e)
 		    {
-			throw new MetacartaException("Could not get a canonical path",e);
+			throw new LCFException("Could not get a canonical path",e);
 		    }
 		}
 
@@ -571,7 +571,7 @@
 		*@return the next document identifier, or null if there are no more.
 		*/
 		public String getNextIdentifier()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			if (currentIndex == ids.length)
 				return null;
@@ -581,7 +581,7 @@
 		/** Close the stream.
 		*/
 		public void close()
-			throws MetacartaException
+			throws LCFException
 		{
 			ids = null;
 		}

Modified: incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/GTSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/GTSConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/GTSConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/GTSConnector.java Wed Feb 17 15:57:27 2010
@@ -78,7 +78,7 @@
         /** Close the connection.  Call this before discarding the connection.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {
                 poster = null;
                 super.disconnect();
@@ -86,13 +86,13 @@
 
         /** Set up a session */
         protected void getSession()
-                throws MetacartaException
+                throws LCFException
         {
                 if (poster == null)
                 {
                         String ingestURI = params.getParameter(GTSConfig.PARAM_INGESTURI);
                         if (ingestURI == null)
-                                throw new MetacartaException("Missing parameter '"+GTSConfig.PARAM_INGESTURI+"'");
+                                throw new LCFException("Missing parameter '"+GTSConfig.PARAM_INGESTURI+"'");
                         String userID = params.getParameter(GTSConfig.PARAM_USERID);
                         String password = params.getObfuscatedParameter(GTSConfig.PARAM_PASSWORD);
                         String realm = params.getParameter(GTSConfig.PARAM_REALM);
@@ -104,7 +104,7 @@
         *@return the connection's status as a displayable string.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
                 try
                 {
@@ -130,7 +130,7 @@
         * the document will not need to be sent again to the output data store.
         */
         public String getOutputDescription(OutputSpecification spec)
-                throws MetacartaException
+                throws LCFException
         {
                 // The information we want in this string is:
                 // (1) the collection name(s), in sorted order.
@@ -191,7 +191,7 @@
         *@return the document status (accepted or permanently rejected).
         */
         public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 // Establish a session
                 getSession();
@@ -224,7 +224,7 @@
         *@activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity.
         */
         public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity activities)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 // Establish a session
                 getSession();

Modified: incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/HttpPoster.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/HttpPoster.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/HttpPoster.java (original)
+++ incubator/lcf/trunk/modules/connectors/gts/connector/org/apache/lcf/agents/output/gts/HttpPoster.java Wed Feb 17 15:57:27 2010
@@ -70,7 +70,7 @@
         {
                 secureSocketFactory = getSecureSocketFactory();
         }
-        catch (MetacartaException e)
+        catch (LCFException e)
         {
                 // If we can't create, print and fail
                 e.printStackTrace();
@@ -85,7 +85,7 @@
      * @param postURI the uri to post the request to
      */
     public HttpPoster(String realm, String userID, String password, String postURI)
-        throws MetacartaException
+        throws LCFException
     {
         if (userID != null && userID.length() > 0 && password != null)
         {
@@ -95,7 +95,7 @@
                 }
                 catch (java.io.UnsupportedEncodingException e)
                 {
-                        throw new MetacartaException("Couldn't convert to utf-8 bytes",e);
+                        throw new LCFException("Couldn't convert to utf-8 bytes",e);
                 }
                 this.realm = realm;
         }
@@ -110,7 +110,7 @@
         }
         catch (MalformedURLException murl)
         {
-            throw new MetacartaException("Bad url",murl);
+            throw new LCFException("Bad url",murl);
         }
 
         // set the port
@@ -125,16 +125,16 @@
                 port = 80;
         }
 
-        String x = Metacarta.getProperty(Metacarta.ingestBufferSizeProperty);
+        String x = LCF.getProperty(LCF.ingestBufferSizeProperty);
         if (x != null && x.length() > 0)
                 buffersize = new Integer(x).intValue();
-        x = Metacarta.getProperty(Metacarta.ingestResponseRetryCount);
+        x = LCF.getProperty(LCF.ingestResponseRetryCount);
         if (x != null && x.length() > 0)
                 responseRetries = new Integer(x).intValue();
-        x = Metacarta.getProperty(Metacarta.ingestResponseRetryInterval);
+        x = LCF.getProperty(LCF.ingestResponseRetryInterval);
         if (x != null && x.length() > 0)
                 responseRetryWait = new Long(x).longValue();
-        x = Metacarta.getProperty(Metacarta.ingestRescheduleInterval);
+        x = LCF.getProperty(LCF.ingestRescheduleInterval);
         if (x != null && x.length() > 0)
                 interruptionRetryTime = new Long(x).longValue();
     }
@@ -144,12 +144,12 @@
      * @param documentURI is the document's uri.
      * @param document is the document structure to ingest.
      * @return true if the ingestion was successful, or false if the ingestion is illegal.
-     * @throws MetacartaException, ServiceInterruption
+     * @throws LCFException, ServiceInterruption
      */
     public boolean indexPost(String documentURI,
         String[] collections, String documentTemplate, String authorityNameString,
         RepositoryDocument document, IOutputAddActivity activities)
-        throws MetacartaException, ServiceInterruption
+        throws LCFException, ServiceInterruption
     {
         StringBuffer aclXml = new StringBuffer();
         writeACLs(aclXml,"share",document.getShareACL(),document.getShareDenyACL(),authorityNameString,activities);
@@ -194,8 +194,8 @@
                     {
                         if (thr instanceof ServiceInterruption)
                             throw (ServiceInterruption)thr;
-                        if (thr instanceof MetacartaException)
-                            throw (MetacartaException)thr;
+                        if (thr instanceof LCFException)
+                            throw (LCFException)thr;
                         if (thr instanceof IOException)
                             throw (IOException)thr;
                         if (thr instanceof RuntimeException)
@@ -208,7 +208,7 @@
 		catch (InterruptedException e)
 		{
                     t.interrupt();
-                    throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                    throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
                 }
             }
             catch (java.net.SocketTimeoutException ioe)
@@ -243,11 +243,11 @@
             // Sleep for a time, and retry
             try
             {
-                Metacarta.sleep(10000L);
+                LCF.sleep(10000L);
             }
             catch (InterruptedException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
             }
             ioErrorRetry--;
             
@@ -259,7 +259,7 @@
 
     /** Write acls into a stringbuffer */
     protected static void writeACLs(StringBuffer aclXml, String type, String[] acl, String[] denyAcl, String authorityNameString, IOutputAddActivity activities)
-        throws MetacartaException
+        throws LCFException
     {
             if (acl != null && acl.length > 0 || denyAcl != null && denyAcl.length > 0)
             {
@@ -295,7 +295,7 @@
     /** Post a check request.
     */
     public void checkPost()
-        throws MetacartaException, ServiceInterruption
+        throws LCFException, ServiceInterruption
     {
         if (Logging.ingest.isDebugEnabled())
                 Logging.ingest.debug("checkPost()");
@@ -317,8 +317,8 @@
                     {
                         if (thr instanceof ServiceInterruption)
                             throw (ServiceInterruption)thr;
-                        if (thr instanceof MetacartaException)
-                            throw (MetacartaException)thr;
+                        if (thr instanceof LCFException)
+                            throw (LCFException)thr;
                         if (thr instanceof IOException)
                             throw (IOException)thr;
                         if (thr instanceof RuntimeException)
@@ -331,7 +331,7 @@
 		catch (InterruptedException e)
 		{
                     t.interrupt();
-                    throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                    throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
                 }
             }
             catch (IOException ioe)
@@ -352,11 +352,11 @@
             // Sleep for a time, and retry
             try
             {
-                Metacarta.sleep(10000L);
+                LCF.sleep(10000L);
             }
             catch (InterruptedException e)
             {
-                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
             }
             ioErrorRetry--;
               
@@ -368,7 +368,7 @@
     *@param documentURI is the document's URI.
     */
     public void deletePost(String documentURI, IOutputRemoveActivity activities)
-        throws MetacartaException, ServiceInterruption
+        throws LCFException, ServiceInterruption
     {
         if (Logging.ingest.isDebugEnabled())
                 Logging.ingest.debug("deletePost(): '" + documentURI + "'");
@@ -393,8 +393,8 @@
                     {
                         if (thr instanceof ServiceInterruption)
                             throw (ServiceInterruption)thr;
-                        if (thr instanceof MetacartaException)
-                            throw (MetacartaException)thr;
+                        if (thr instanceof LCFException)
+                            throw (LCFException)thr;
                         if (thr instanceof IOException)
                             throw (IOException)thr;
                         if (thr instanceof RuntimeException)
@@ -407,7 +407,7 @@
 		catch (InterruptedException e)
 		{
                     t.interrupt();
-                    throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+                    throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
                 }
             }
             catch (IOException ioe)
@@ -429,11 +429,11 @@
             // Sleep for a time, and retry
             try
             {
-                Metacarta.sleep(10000L);
+                LCF.sleep(10000L);
             }
             catch (InterruptedException e)
             {
-                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
             }
             
             ioErrorRetry--;
@@ -446,9 +446,9 @@
      * Get the response code of the post
      * @param stream the stream the response is going to come from
      * @return the response string
-     * @throws MetacartaException
+     * @throws LCFException
      */
-    protected String getResponse(BufferedReader stream) throws MetacartaException, ServiceInterruption
+    protected String getResponse(BufferedReader stream) throws LCFException, ServiceInterruption
     {
         Logging.ingest.debug("Waiting for response stream");
         StringBuffer res = new StringBuffer();
@@ -479,7 +479,7 @@
         }
         catch (InterruptedIOException e)
         {
-                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
         }
         catch (java.net.ConnectException e)
         {
@@ -556,7 +556,7 @@
     /** Build a secure socket factory based on no keystore and a lax trust manager.
     * This allows use of SSL for privacy but not identification. */
     protected static javax.net.ssl.SSLSocketFactory getSecureSocketFactory()
-        throws MetacartaException
+        throws LCFException
     {
             try
             {
@@ -569,18 +569,18 @@
             }
             catch (java.security.NoSuchAlgorithmException e)
             {
-                throw new MetacartaException("No such algorithm",e);
+                throw new LCFException("No such algorithm",e);
             }
             catch (java.security.KeyManagementException e)
             {
-                throw new MetacartaException("Key management exception",e);
+                throw new LCFException("Key management exception",e);
             }
     }
 
     /** Create a socket in a manner consistent with all of our specified parameters.
     */
     protected Socket createSocket(long responseRetryCount)
-            throws IOException, MetacartaException
+            throws IOException, LCFException
     {
             Socket socket;
             if (protocol.equals("https"))
@@ -596,7 +596,7 @@
                     }
                     catch (IOException e)
                     {
-                            throw new MetacartaException("Couldn't set up SSL connection to ingestion API: "+e.getMessage(),e);
+                            throw new LCFException("Couldn't set up SSL connection to ingestion API: "+e.getMessage(),e);
                     }
             }
             else
@@ -918,7 +918,7 @@
                                         
                                         // A negative number means http error of some kind.
                                         if (codeValue < 0)
-                                                throw new MetacartaException("Http protocol error");
+                                                throw new LCFException("Http protocol error");
 
                                         // 200 means everything went OK
                                         if (codeValue == 200)
@@ -934,11 +934,11 @@
                                         //    If the situation is (2), then we CAN'T retry if we already read any of the stream; therefore
                                         //    we are forced to throw a "service interrupted" exception, and let the caller reschedule
                                         //    the ingestion.
-                                        // 3) Something is wrong with the setup, e.g. bad credentials.  In this case we chuck a MetacartaException,
+                                        // 3) Something is wrong with the setup, e.g. bad credentials.  In this case we chuck a LCFException,
                                         //    since this will abort the current activity entirely.
 
                                         if (codeValue == 401)
-                                                throw new MetacartaException("Bad credentials for ingestion",MetacartaException.SETUP_ERROR);
+                                                throw new LCFException("Bad credentials for ingestion",LCFException.SETUP_ERROR);
 
                                         if (codeValue >= 400 && codeValue < 500)
                                         {
@@ -949,7 +949,7 @@
                                         // If this continues, we should indeed abort the job.  Retries should not go on indefinitely either; 2 hours is plenty
                                         long currentTime = System.currentTimeMillis();
                                         throw new ServiceInterruption("Error "+Integer.toString(codeValue)+" from ingestion request; ingestion will be retried again later",
-                                                new MetacartaException("Ingestion HTTP error code "+Integer.toString(codeValue)),
+                                                new LCFException("Ingestion HTTP error code "+Integer.toString(codeValue)),
                                                 currentTime + interruptionRetryTime,
                                                 currentTime + 2L * 60L * 60000L,
                                                 -1,
@@ -989,7 +989,7 @@
                 }
                 catch (UnsupportedEncodingException ioe)
                 {
-                        throw new MetacartaException("Fatal ingestion error: "+ioe.getMessage(),ioe);
+                        throw new LCFException("Fatal ingestion error: "+ioe.getMessage(),ioe);
                 }
                 catch (java.net.SocketTimeoutException ioe)
                 {
@@ -1168,7 +1168,7 @@
                                         int codeValue = cd.getCodeValue();
                                         
                                         if (codeValue < 0)
-                                                throw new MetacartaException("Http protocol error");
+                                                throw new LCFException("Http protocol error");
 
                                         // 200 means everything went OK
                                         if (codeValue == 200)
@@ -1176,13 +1176,13 @@
 
                                         // We ignore everything in the range from 400-500 now
                                         if (codeValue == 401)
-                                                throw new MetacartaException("Bad credentials for ingestion",MetacartaException.SETUP_ERROR);
+                                                throw new LCFException("Bad credentials for ingestion",LCFException.SETUP_ERROR);
 
                                         if (codeValue >= 400 && codeValue < 500)
                                                 return;
 
                                         // Anything else means the document didn't delete.  Throw the error.
-                                        throw new MetacartaException("Error deleting document: '"+res+"'");
+                                        throw new LCFException("Error deleting document: '"+res+"'");
                                 }
                                 finally
                                 {
@@ -1218,7 +1218,7 @@
                 }
                 catch (UnsupportedEncodingException ioe)
                 {
-                        throw new MetacartaException("Fatal ingestion error: "+ioe.getMessage(),ioe);
+                        throw new LCFException("Fatal ingestion error: "+ioe.getMessage(),ioe);
                 }
                 catch (InterruptedIOException ioe)
                 {
@@ -1323,7 +1323,7 @@
                                         
                                         int codeValue = cd.getCodeValue();
                                         if (codeValue < 0)
-                                                throw new MetacartaException("Http protocol error");
+                                                throw new LCFException("Http protocol error");
 
                                         // 200 means everything went OK
                                         if (codeValue == 200)
@@ -1331,10 +1331,10 @@
 
                                         // We ignore everything in the range from 400-500 now
                                         if (codeValue == 401)
-                                                throw new MetacartaException("Bad credentials for ingestion",MetacartaException.SETUP_ERROR);
+                                                throw new LCFException("Bad credentials for ingestion",LCFException.SETUP_ERROR);
 
                                         // Anything else means the info request failed.
-                                        throw new MetacartaException("Error connecting to MetaCarta ingestion API: '"+res+"'");
+                                        throw new LCFException("Error connecting to MetaCarta ingestion API: '"+res+"'");
                                 }
                                 finally
                                 {
@@ -1370,7 +1370,7 @@
                 }
                 catch (UnsupportedEncodingException ioe)
                 {
-                        throw new MetacartaException("Fatal ingestion error: "+ioe.getMessage(),ioe);
+                        throw new LCFException("Fatal ingestion error: "+ioe.getMessage(),ioe);
                 }
                 catch (InterruptedIOException ioe)
                 {

Modified: incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/GetConnectionInfo.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/GetConnectionInfo.java (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/GetConnectionInfo.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.crawler.interfaces.*;
 import org.apache.lcf.crawler.system.Logging;
-import org.apache.lcf.crawler.system.Metacarta;
+import org.apache.lcf.crawler.system.LCF;
 
 public class GetConnectionInfo
 {
@@ -48,15 +48,15 @@
 		
 		try
 		{
-		        Metacarta.initializeEnvironment();
+		        LCF.initializeEnvironment();
 			IThreadContext tc = ThreadContextFactory.make();
 			IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
 			IRepositoryConnection connection = connectionManager.load(connectionName);
 			if (connection == null)
-				throw new MetacartaException("Connection "+connectionName+" does not exist");
+				throw new LCFException("Connection "+connectionName+" does not exist");
 			
 			if (connection.getClassName() == null || !connection.getClassName().equals("org.apache.lcf.crawler.connectors.sharedrive.SharedDriveConnector"))
-				throw new MetacartaException("Command can only be used on working share connector connections.");
+				throw new LCFException("Command can only be used on working share connector connections.");
 
 			ConfigParams cfg = connection.getConfigParams();
 			

Modified: incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/MatchMap.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/MatchMap.java (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/MatchMap.java Wed Feb 17 15:57:27 2010
@@ -261,7 +261,7 @@
 	/** Perform a translation.
 	*/
 	public String translate(String input)
-		throws MetacartaException
+		throws LCFException
 	{
 		// Build pattern vector if not already there
 		if (matchPatterns == null)
@@ -278,7 +278,7 @@
 				catch (java.util.regex.PatternSyntaxException e)
 				{
 					matchPatterns = null;
-					throw new MetacartaException("For match expression '"+regexp+"', found pattern syntax error: "+e.getMessage(),e);
+					throw new LCFException("For match expression '"+regexp+"', found pattern syntax error: "+e.getMessage(),e);
 				}
 				i++;
 			}

Modified: incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java Wed Feb 17 15:57:27 2010
@@ -41,7 +41,7 @@
 import org.apache.lcf.agents.interfaces.RepositoryDocument;
 import org.apache.lcf.agents.interfaces.ServiceInterruption;
 import org.apache.lcf.core.interfaces.ConfigParams;
-import org.apache.lcf.core.interfaces.MetacartaException;
+import org.apache.lcf.core.interfaces.LCFException;
 import org.apache.lcf.crawler.interfaces.DocumentSpecification;
 import org.apache.lcf.crawler.interfaces.IDocumentIdentifierStream;
 import org.apache.lcf.crawler.interfaces.IProcessActivity;
@@ -125,13 +125,13 @@
 
         /** Establish a "session".  In the case of the jcifs connector, this just builds the appropriate smbconnectionPath string, and does the necessary checks. */
         protected void getSession()
-                throws MetacartaException
+                throws LCFException
         {
                 if (smbconnectionPath == null)
                 {
                         // Get the server
                         if (server == null || server.length() == 0)
-                                throw new MetacartaException("Missing parameter '"+SharedDriveParameters.server+"'");
+                                throw new LCFException("Missing parameter '"+SharedDriveParameters.server+"'");
 
                         // make the smb connection to the server
                         String authenticationString;
@@ -153,7 +153,7 @@
                         catch (MalformedURLException e)
                         {
                                 Logging.connectors.error("Unable to access SMB/CIFS share: "+"smb://" + authenticationString.substring(0,authenticationString.indexOf(":")+1) + "<password>@" + server + "/\n" + e);
-                                throw new MetacartaException("Unable to access SMB/CIFS share: "+server, e, MetacartaException.REPOSITORY_CONNECTION_ERROR);
+                                throw new LCFException("Unable to access SMB/CIFS share: "+server, e, LCFException.REPOSITORY_CONNECTION_ERROR);
                         }	
                 }
         }
@@ -181,7 +181,7 @@
         /** Close the connection.  Call this before discarding the repository connector.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {
                 server = null;
                 domain = null;
@@ -255,7 +255,7 @@
          * @return the document uri.
          */
         protected static String convertToURI(String documentIdentifier, MatchMap fileMap, MatchMap uriMap)
-                throws MetacartaException
+                throws LCFException
         {
                 //
                 // Note well: This MUST be a legal URI!!
@@ -302,7 +302,7 @@
                         catch (java.io.UnsupportedEncodingException e)
                         {
                             // Should not happen...
-                            throw new MetacartaException(e.getMessage(),e);
+                            throw new LCFException(e.getMessage(),e);
                         }
                 }
                 else
@@ -354,7 +354,7 @@
                         catch (java.io.UnsupportedEncodingException e)
                         {
                             // Should not happen...
-                            throw new MetacartaException(e.getMessage(),e);
+                            throw new LCFException(e.getMessage(),e);
                         }
                 }
         }
@@ -373,7 +373,7 @@
         *@return the stream of local document identifiers that should be added to the queue.
         */
         public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec, long startTime, long endTime)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 getSession();
                 return new IdentifierStream(spec);
@@ -399,7 +399,7 @@
         */
         public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
                 DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 getSession();
                 // Read the forced acls.  A null return indicates that security is disabled!!!
@@ -546,7 +546,7 @@
                     catch (MalformedURLException mue)
                     {
                         Logging.connectors.error("JCIFS: MalformedURLException thrown: "+mue.getMessage(),mue);
-                        throw new MetacartaException("MalformedURLException thrown: "+mue.getMessage(),mue);
+                        throw new LCFException("MalformedURLException thrown: "+mue.getMessage(),mue);
                     }
                     catch (SmbException se)
                     {
@@ -562,7 +562,7 @@
                     }
                     catch (InterruptedIOException e)
                     {
-                        throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                        throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
                     }
                     catch (IOException e)
                     {
@@ -598,7 +598,7 @@
          *            methods.
          */
         public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities,
-                    DocumentSpecification spec, boolean[] scanOnly) throws MetacartaException, ServiceInterruption
+                    DocumentSpecification spec, boolean[] scanOnly) throws LCFException, ServiceInterruption
         {
                 getSession();
                 
@@ -791,7 +791,7 @@
                         Logging.connectors.error("MalformedURLException tossed",mue);
                         activities.recordActivity(null,ACTIVITY_ACCESS,
                                 null,documentIdentifier,"Error","Malformed URL: "+mue.getMessage(),null);
-                        throw new MetacartaException("MalformedURLException tossed: "+mue.getMessage(),mue);
+                        throw new LCFException("MalformedURLException tossed: "+mue.getMessage(),mue);
                     }
                     catch (jcifs.smb.SmbAuthException e)
                     {
@@ -812,7 +812,7 @@
                                 // See if it's an interruption
                                 jcifs.util.transport.TransportException te = (jcifs.util.transport.TransportException)cause;
                                 if (te.getRootCause() != null && te.getRootCause() instanceof java.lang.InterruptedException)
-                                        throw new MetacartaException(te.getRootCause().getMessage(),te.getRootCause(),MetacartaException.INTERRUPTED);
+                                        throw new LCFException(te.getRootCause().getMessage(),te.getRootCause(),LCFException.INTERRUPTED);
 
                                 Logging.connectors.warn("JCIFS: Timeout processing document/directory "+documentIdentifier+": retrying...",se);
                                 activities.recordActivity(null,ACTIVITY_ACCESS,
@@ -873,7 +873,7 @@
                                 Logging.connectors.error("JCIFS: SmbException tossed processing "+documentIdentifier,se);
                                 activities.recordActivity(null,ACTIVITY_ACCESS,
                                         null,documentIdentifier,"Error","Unknown: "+se.getMessage(),null);
-                                throw new MetacartaException("SmbException tossed: "+se.getMessage(),se);
+                                throw new LCFException("SmbException tossed: "+se.getMessage(),se);
                         }
                     }
                     catch (java.net.SocketTimeoutException e)
@@ -887,7 +887,7 @@
                     }
                     catch (InterruptedIOException e)
                     {
-                        throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                        throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
                     }
                     catch (IOException e)
                     {
@@ -911,7 +911,7 @@
         */
         protected void describeDocumentSecurity(StringBuffer description, SmbFile file, String[] forcedacls,
                 String[] forcedShareAcls)
-                throws MetacartaException, IOException
+                throws LCFException, IOException
         {
                 String[] shareAllowAcls;
                 String[] shareDenyAcls;
@@ -1084,7 +1084,7 @@
 
 
         protected static void processSMBException(SmbException se, String documentIdentifier, String activity, String operation)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 // At least some of these are transport errors, and should be treated as service
                 // interruptions.
@@ -1095,7 +1095,7 @@
                         // See if it's an interruption
                         jcifs.util.transport.TransportException te = (jcifs.util.transport.TransportException)cause;
                         if (te.getRootCause() != null && te.getRootCause() instanceof java.lang.InterruptedException)
-                                throw new MetacartaException(te.getRootCause().getMessage(),te.getRootCause(),MetacartaException.INTERRUPTED);
+                                throw new LCFException(te.getRootCause().getMessage(),te.getRootCause(),LCFException.INTERRUPTED);
                         Logging.connectors.warn("JCIFS: Timeout "+activity+" for "+documentIdentifier+": retrying...",se);
                         // Transport exceptions no longer abort when they give up, so we can't get notified that there is a problem.
 
@@ -1142,12 +1142,12 @@
                 else if (se.getMessage().indexOf("Incorrect function") != -1)
                 {
                         Logging.connectors.error("JCIFS: Server does not support a required operation ("+operation+"?) for "+documentIdentifier);
-                        throw new MetacartaException("Server does not support a required operation ("+operation+", possibly?) accessing document "+documentIdentifier,se);
+                        throw new LCFException("Server does not support a required operation ("+operation+", possibly?) accessing document "+documentIdentifier,se);
                 }
                 else
                 {
                         Logging.connectors.error("SmbException thrown "+activity+" for "+documentIdentifier,se);
-                        throw new MetacartaException("SmbException thrown: "+se.getMessage(),se);
+                        throw new LCFException("SmbException thrown: "+se.getMessage(),se);
                 }
         }
 
@@ -1209,7 +1209,7 @@
         }
 
         protected static int setPathMetadata(RepositoryDocument rd, String version, int index)
-                throws MetacartaException
+                throws LCFException
         {
                 if (version.length() > index && version.charAt(index++) == '+')
                 {
@@ -1233,7 +1233,7 @@
         /** Check status of connection.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
             getSession();
             String serverURI = smbconnectionPath;
@@ -1265,7 +1265,7 @@
                         }
                         catch (InterruptedIOException e)
                         {
-                                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
                         }
                         catch (IOException e)
                         {
@@ -1291,7 +1291,7 @@
         *@return true if it should be included.
         */
         protected boolean checkInclude(SmbFile file, String fileName, DocumentSpecification documentSpecification)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
             if (Logging.connectors.isDebugEnabled())
                 Logging.connectors.debug("JCIFS: In checkInclude for '"+fileName+"'");
@@ -1346,7 +1346,7 @@
                                         }
                                         catch (NumberFormatException e)
                                         {
-                                                throw new MetacartaException("Bad number",e);
+                                                throw new LCFException("Bad number",e);
                                         }
                                 }
                         }
@@ -1476,15 +1476,15 @@
             }
             catch (java.net.SocketTimeoutException e)
             {
-                throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
             }
             catch (InterruptedIOException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
             }
             catch (IOException e)
             {
-                throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
             }
             finally
             {
@@ -1504,7 +1504,7 @@
         */
         protected boolean wouldFileBeIncluded(String fileName, DocumentSpecification documentSpecification,
                 boolean pretendIndexable)
-                throws MetacartaException
+                throws LCFException
         {
             if (Logging.connectors.isDebugEnabled())
                 Logging.connectors.debug("JCIFS: In wouldFileBeIncluded for '"+fileName+"', pretendIndexable="+(pretendIndexable?"true":"false"));
@@ -1613,15 +1613,15 @@
             }
             catch (java.net.SocketTimeoutException e)
             {
-                throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
             }
             catch (InterruptedIOException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
             }
             catch (IOException e)
             {
-                throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
             }
             finally
             {
@@ -1637,7 +1637,7 @@
         *@return true if the file needs to be fingerprinted.
         */
         protected boolean checkNeedFileData(String fileName, DocumentSpecification documentSpecification)
-                throws MetacartaException
+                throws LCFException
         {
             return wouldFileBeIncluded(fileName,documentSpecification,true) != wouldFileBeIncluded(fileName,documentSpecification,false);
         }
@@ -1651,7 +1651,7 @@
         *@return true if the file should be ingested.
         */
         protected boolean checkIngest(File localFile, String fileName, DocumentSpecification documentSpecification)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
             if (Logging.connectors.isDebugEnabled())
                 Logging.connectors.debug("JCIFS: In checkIngest for '"+fileName+"'");
@@ -1775,15 +1775,15 @@
             }
             catch (java.net.SocketTimeoutException e)
             {
-                throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
             }
             catch (InterruptedIOException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
             }
             catch (IOException e)
             {
-                throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
             }
             finally
             {
@@ -1986,7 +1986,7 @@
         * The code here has been lifted algorithmically from products/ShareCrawler/Fingerprinter.pas.
         */
         protected static int fingerprint(File file)
-                throws MetacartaException
+                throws LCFException
         {
                 try
                 {
@@ -2060,7 +2060,7 @@
                 }
                 catch (InterruptedIOException e)
                 {
-                        throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                        throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
                 }
                 catch (IOException e)
                 {
@@ -2223,7 +2223,7 @@
         * does not seem to be an OLE compound document.
         */
         protected static String getAppName(File documentPath)
-                throws MetacartaException
+                throws LCFException
         {
             try
             {
@@ -2250,7 +2250,7 @@
             }
             catch (InterruptedIOException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
             }
             catch (Throwable e)
             {
@@ -2719,7 +2719,7 @@
                 protected int currentIndex = 0;
 
                 public IdentifierStream(DocumentSpecification spec)
-                        throws MetacartaException
+                        throws LCFException
                 {
                     try
                     {
@@ -2756,15 +2756,15 @@
                     }
                     catch (java.net.SocketTimeoutException e)
                     {
-                        throw new MetacartaException("Couldn't map to canonical path: "+e.getMessage(),e);
+                        throw new LCFException("Couldn't map to canonical path: "+e.getMessage(),e);
                     }
                     catch (InterruptedIOException e)
                     {
-                        throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                        throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
                     }
                     catch (IOException e)
                     {
-                        throw new MetacartaException("Could not get a canonical path: "+e.getMessage(),e);
+                        throw new LCFException("Could not get a canonical path: "+e.getMessage(),e);
                     }
                 }
 
@@ -2772,7 +2772,7 @@
                 *@return the next document identifier, or null if there are no more.
                 */
                 public String getNextIdentifier()
-                        throws MetacartaException, ServiceInterruption
+                        throws LCFException, ServiceInterruption
                 {
                         if (currentIndex == ids.length)
                                 return null;
@@ -2782,7 +2782,7 @@
                 /** Close the stream.
                 */
                 public void close()
-                        throws MetacartaException
+                        throws LCFException
                 {
                         ids = null;
                 }
@@ -2798,7 +2798,7 @@
          * @return an array of SmbFile
          */
         public SmbFile[] getShareNames(String serverURI)
-                throws MetacartaException
+                throws LCFException
         {
             getSession();
             SmbFile server = null;
@@ -2808,7 +2808,7 @@
             }
             catch (MalformedURLException e1)
             {
-                throw new MetacartaException("MalformedURLException tossed",e1);
+                throw new LCFException("MalformedURLException tossed",e1);
             }
             SmbFile[] shares = null;
             try
@@ -2821,7 +2821,7 @@
             }
             catch (SmbException e)
             {
-                throw new MetacartaException("SmbException tossed: "+e.getMessage(),e);
+                throw new LCFException("SmbException tossed: "+e.getMessage(),e);
             }
             return shares;
         }
@@ -2830,9 +2830,9 @@
         * Given a folder path, determine if the folder is in fact legal and accessible (and is a folder).
          * @param folder is the relative folder from the network root
          * @return the canonical folder name if valid, or null if not.
-         * @throws MetacartaException
+         * @throws LCFException
         */
-        public String validateFolderName(String folder) throws MetacartaException
+        public String validateFolderName(String folder) throws LCFException
         {
             getSession();
             //create new connection by appending to the old connection
@@ -2849,7 +2849,7 @@
             }
             catch (MalformedURLException e1)
             {
-                throw new MetacartaException("validateFolderName: Can't get parent file: " + uri,e1);
+                throw new LCFException("validateFolderName: Can't get parent file: " + uri,e1);
             }
         
             try
@@ -2872,24 +2872,24 @@
                 }
                 catch (ServiceInterruption si)
                 {
-                        throw new MetacartaException("Service interruption: "+si.getMessage(),si);
+                        throw new LCFException("Service interruption: "+si.getMessage(),si);
                 }
             }
             catch (MalformedURLException e)
             {
-                throw new MetacartaException("MalformedURLException tossed: "+e.getMessage(),e);
+                throw new LCFException("MalformedURLException tossed: "+e.getMessage(),e);
             }
             catch (java.net.SocketTimeoutException e)
             {
-                throw new MetacartaException("IOException tossed: "+e.getMessage(),e);
+                throw new LCFException("IOException tossed: "+e.getMessage(),e);
             }
             catch (InterruptedIOException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
             }
             catch (IOException e)
             {
-                throw new MetacartaException("IOException tossed: "+e.getMessage(),e);
+                throw new LCFException("IOException tossed: "+e.getMessage(),e);
             }
 
         }
@@ -2899,9 +2899,9 @@
          * 
          * @param folder is the relative folder from the network root
          * @return array of child folder names
-         * @throws MetacartaException
+         * @throws LCFException
          */
-        public String[] getChildFolderNames(String folder) throws MetacartaException
+        public String[] getChildFolderNames(String folder) throws LCFException
         {
             getSession();
             //create new connection by appending to the old connection
@@ -2918,7 +2918,7 @@
             }
             catch (MalformedURLException e1)
             {
-                throw new MetacartaException("getChildFolderNames: Can't get parent file: " + uri,e1);
+                throw new LCFException("getChildFolderNames: Can't get parent file: " + uri,e1);
             }
         
             // add DFS support
@@ -2937,24 +2937,24 @@
                 }
                 catch (ServiceInterruption si)
                 {
-                        throw new MetacartaException("Service interruption: "+si.getMessage(),si);
+                        throw new LCFException("Service interruption: "+si.getMessage(),si);
                 }
             }
             catch (MalformedURLException e)
             {
-                throw new MetacartaException("MalformedURLException tossed: "+e.getMessage(),e);
+                throw new LCFException("MalformedURLException tossed: "+e.getMessage(),e);
             }
             catch (java.net.SocketTimeoutException e)
             {
-                throw new MetacartaException("IOException tossed: "+e.getMessage(),e);
+                throw new LCFException("IOException tossed: "+e.getMessage(),e);
             }
             catch (InterruptedIOException e)
             {
-                throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+                throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
             }
             catch (IOException e)
             {
-                throw new MetacartaException("IOException tossed: "+e.getMessage(),e);
+                throw new LCFException("IOException tossed: "+e.getMessage(),e);
             }
 
             // populate a String array
@@ -3093,7 +3093,7 @@
                 /** Document specification */
                 protected DocumentSpecification spec;
                 /** Exceptions that we saw.  These are saved here so that they can be rethrown when done */
-                protected MetacartaException metacartaException = null;
+                protected LCFException metacartaException = null;
                 protected ServiceInterruption serviceInterruption = null;
 
                 /** Constructor */
@@ -3143,7 +3143,7 @@
 
                                 return false;
                         }
-                        catch (MetacartaException e)
+                        catch (LCFException e)
                         {
                                 if (metacartaException == null)
                                         metacartaException = e;
@@ -3159,7 +3159,7 @@
 
                 /** Check for exception, and throw if there is one */
                 public void checkAndThrow()
-                        throws ServiceInterruption, MetacartaException
+                        throws ServiceInterruption, LCFException
                 {
                         if (metacartaException != null)
                                 throw metacartaException;

Modified: incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveHelpers.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveHelpers.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveHelpers.java (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveHelpers.java Wed Feb 17 15:57:27 2010
@@ -16,7 +16,7 @@
 */
 package org.apache.lcf.crawler.connectors.sharedrive;
 
-import org.apache.lcf.core.interfaces.MetacartaException;
+import org.apache.lcf.core.interfaces.LCFException;
 
 import java.io.FileOutputStream;
 import java.io.FileInputStream;
@@ -54,7 +54,7 @@
 	*@param password is the password.
 	*/
 	public SharedDriveHelpers(String serverName, String userName, String password)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -65,14 +65,14 @@
         	}
 		catch (MalformedURLException e)
 		{
-			throw new MetacartaException("Unable to access SMB/CIFS share: "+serverName, e, MetacartaException.SETUP_ERROR);
+			throw new LCFException("Unable to access SMB/CIFS share: "+serverName, e, LCFException.SETUP_ERROR);
         	}	
 	}
 
 	/** Close the connection.
 	*/
 	public void close()
-		throws MetacartaException
+		throws LCFException
 	{
 		// Just let stuff go
 		pa = null;	
@@ -85,7 +85,7 @@
 	*@return the target path if the document is found, or "" if it is not.
 	*/
 	public String lookupDocument(String targetPath)
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -97,7 +97,7 @@
 	    }
 	    catch (IOException e)
 	    {
-		throw new MetacartaException("IO exception: "+e.getMessage(),e);
+		throw new LCFException("IO exception: "+e.getMessage(),e);
 	    }
 	}
 
@@ -108,7 +108,7 @@
 	*@return the target path.
 	*/
 	public String addDocument(String targetPath, String sourceFile)
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -150,7 +150,7 @@
 	    }
 	    catch (IOException e)
 	    {
-		throw new MetacartaException("IO exception: "+e.getMessage(),e);
+		throw new LCFException("IO exception: "+e.getMessage(),e);
 	    }
 	}
 
@@ -159,7 +159,7 @@
 	*       separated by "/" characters.
 	*/
 	public void deleteDocument(String targetPath)
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -169,7 +169,7 @@
 	    }
 	    catch (IOException e)
 	    {
-		throw new MetacartaException("IO exception: "+e.getMessage(),e);
+		throw new LCFException("IO exception: "+e.getMessage(),e);
 	    }
 	}
 
@@ -179,7 +179,7 @@
 	*@param userName is the user to add.
 	*/
 	public void addUserToFolder(String targetPath, String userName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// MHL
 	}
@@ -190,7 +190,7 @@
 	*@param userName is the user to remove.
 	*/
 	public void removeUserFromFolder(String targetPath, String userName)
-		throws MetacartaException
+		throws LCFException
 	{
 		// MHL
 	}

Modified: incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/editspec.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/editspec.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/editspec.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/editspec.jsp Wed Feb 17 15:57:27 2010
@@ -247,7 +247,7 @@
 				pathSoFar = "";
 				childList = c.getChildFolderNames("");
 				if (childList == null)
-					throw new MetacartaException("Can't find any children for root folder");
+					throw new LCFException("Can't find any children for root folder");
 			}
 	    } finally {
 			RepositoryConnectorFactory.release(connector);
@@ -286,7 +286,7 @@
 <%
 	    }
 	  }
-	  catch (MetacartaException e)
+	  catch (LCFException e)
 	  {
 		e.printStackTrace();
 		out.println(org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage()));

Modified: incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/postspec.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/postspec.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/postspec.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/connectors/sharedrive/postspec.jsp Wed Feb 17 15:57:27 2010
@@ -241,7 +241,7 @@
 						RepositoryConnectorFactory.release(connector);
 					}
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
 					// Effectively, this just means we can't add a typein to the path right now.
 				}

Modified: incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/IDynamicResultSet.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/IDynamicResultSet.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/IDynamicResultSet.java (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/IDynamicResultSet.java Wed Feb 17 15:57:27 2010
@@ -34,10 +34,10 @@
 	*@return the immutable row description, or null if there is no such row.
 	*/
 	public IResultRow getNextRow()
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 
 	/** Close this resultset.
 	*/
 	public void close()
-		throws MetacartaException, ServiceInterruption;
+		throws LCFException, ServiceInterruption;
 }

Modified: incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnection.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnection.java (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnection.java Wed Feb 17 15:57:27 2010
@@ -55,7 +55,7 @@
 	}
 
 	protected static IResultRow readNextResultRowViaThread(ResultSet rs, ResultSetMetaData rsmd, String[] resultCols)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		NextResultRowThread t = new NextResultRowThread(rs,rsmd,resultCols);
 		try
@@ -66,9 +66,9 @@
 			if (thr != null)
 			{
 				if (thr instanceof java.sql.SQLException)
-					throw new MetacartaException("Error fetching next JDBC result row: "+thr.getMessage(),thr);
-				else if (thr instanceof MetacartaException)
-					throw (MetacartaException)thr;
+					throw new LCFException("Error fetching next JDBC result row: "+thr.getMessage(),thr);
+				else if (thr instanceof LCFException)
+					throw (LCFException)thr;
                                 else if (thr instanceof ServiceInterruption)
                                         throw (ServiceInterruption)thr;
 				else if (thr instanceof RuntimeException)
@@ -81,7 +81,7 @@
 		catch (InterruptedException e)
 		{
 			t.interrupt();
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 	}
 
@@ -127,7 +127,7 @@
 	}
 
 	protected static IResultRow readNextResultRow(ResultSet rs, ResultSetMetaData rsmd, String[] resultCols)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -139,12 +139,12 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Result set error: "+e.getMessage(),e);
+			throw new LCFException("Result set error: "+e.getMessage(),e);
 		}
 	}
 
 	protected static void closeResultset(ResultSet rs)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -152,12 +152,12 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Exception closing resultset: "+e.getMessage(),e);
+			throw new LCFException("Exception closing resultset: "+e.getMessage(),e);
 		}
 	}
 	
 	protected static void closeStmt(Statement stmt)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -165,12 +165,12 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Exception closing statement: "+e.getMessage(),e);
+			throw new LCFException("Exception closing statement: "+e.getMessage(),e);
 		}
 	}
 	
 	protected static void closePS(PreparedStatement ps)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -178,7 +178,7 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Exception closing statement: "+e.getMessage(),e);
+			throw new LCFException("Exception closing statement: "+e.getMessage(),e);
 		}
 	}
 		
@@ -186,7 +186,7 @@
 	/** Test connection.
 	*/
 	public void testConnection()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		TestConnectionThread t = new TestConnectionThread();
 		try
@@ -197,9 +197,9 @@
 			if (thr != null)
 			{
 				if (thr instanceof java.sql.SQLException)
-					throw new MetacartaException("Error doing JDBC connection test: "+thr.getMessage(),thr);
-				else if (thr instanceof MetacartaException)
-					throw (MetacartaException)thr;
+					throw new LCFException("Error doing JDBC connection test: "+thr.getMessage(),thr);
+				else if (thr instanceof LCFException)
+					throw (LCFException)thr;
                                 else if (thr instanceof ServiceInterruption)
                                         throw (ServiceInterruption)thr;
 				else if (thr instanceof RuntimeException)
@@ -211,7 +211,7 @@
 		catch (InterruptedException e)
 		{
 			t.interrupt();
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 	}
 
@@ -247,7 +247,7 @@
 	/** Execute query.
 	*/
 	public IDynamicResultSet executeUncachedQuery(String query, ArrayList params, int maxResults)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (params == null)
 			return new JDBCResultSet(query,maxResults);
@@ -258,7 +258,7 @@
 	/** Execute operation.
 	*/
 	public void executeOperation(String query, ArrayList params)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		ExecuteOperationThread t = new ExecuteOperationThread(query,params);
 		try
@@ -269,9 +269,9 @@
 			if (thr != null)
 			{
 				if (thr instanceof java.sql.SQLException)
-					throw new MetacartaException("Exception doing connector query '"+query+"': "+thr.getMessage(),thr);
-				else if (thr instanceof MetacartaException)
-					throw (MetacartaException)thr;
+					throw new LCFException("Exception doing connector query '"+query+"': "+thr.getMessage(),thr);
+				else if (thr instanceof LCFException)
+					throw (LCFException)thr;
                                 else if (thr instanceof ServiceInterruption)
                                         throw (ServiceInterruption)thr;
 				else if (thr instanceof RuntimeException)
@@ -283,7 +283,7 @@
 		catch (InterruptedException e)
 		{
 			t.interrupt();
-			throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 		}
 	}
 
@@ -334,7 +334,7 @@
 	* @param params ArrayList if params !=null, use preparedStatement
 	*/
 	protected static IResultSet execute(Connection connection, String query, ArrayList params, boolean bResults, int maxResults)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 
 		ResultSet rs;
@@ -404,19 +404,19 @@
 			}
 
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			throw e;
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Exception doing connector query '"+query+"': "+e.getMessage(),e);
+			throw new LCFException("Exception doing connector query '"+query+"': "+e.getMessage(),e);
 		}
 	}
 
 	/** Read the current row from the resultset */
 	protected static IResultRow readResultRow(ResultSet rs, ResultSetMetaData rsmd, String[] resultCols)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -468,12 +468,12 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Resultset error: "+e.getMessage(),e);
+			throw new LCFException("Resultset error: "+e.getMessage(),e);
 		}
 	}
 
 	protected static String[] readColumnNames(ResultSetMetaData rsmd)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -493,13 +493,13 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Sql exception reading column names: "+e.getMessage(),e);
+			throw new LCFException("Sql exception reading column names: "+e.getMessage(),e);
 		}
 	}
 
 	// Read data from a resultset
 	protected static IResultSet getData(ResultSet rs, int maxResults)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 	    try
 	    {
@@ -516,7 +516,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))
@@ -531,13 +531,13 @@
 	    }
 	    catch (java.sql.SQLException e)
 	    {
-		throw new MetacartaException("Resultset error: "+e.getMessage(),e);
+		throw new LCFException("Resultset error: "+e.getMessage(),e);
 	    }
 	}
 
 	// 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)
 		{
@@ -595,7 +595,7 @@
 	/** Clean up parameters after query has been triggered.
 	*/
 	protected static void cleanupParameters(ArrayList data)
-		throws MetacartaException
+		throws LCFException
 	{
 		if (data != null)
 		{
@@ -614,7 +614,7 @@
 	}
 		
 	protected static int findColumn(ResultSet rs, String name)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -627,7 +627,7 @@
 	}
 
 	protected static Blob getBLOB(ResultSet rs, int col)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -635,12 +635,12 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in getBlob("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in getBlob("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected static Clob getCLOB(ResultSet rs, int col)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -648,12 +648,12 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in getClob("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in getClob("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected static boolean isBLOB(ResultSetMetaData rsmd, int col)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -662,12 +662,12 @@
 		}
 		catch (java.sql.SQLException 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 static boolean isBinaryData(ResultSetMetaData rsmd, int col)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -677,12 +677,12 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in isBinaryData("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in isBinaryData("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected static boolean isCLOB(ResultSetMetaData rsmd, int col)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		try
 		{
@@ -691,12 +691,12 @@
 		}
 		catch (java.sql.SQLException sqle)
 		{
-			throw new MetacartaException("Error in isClob("+col+"): "+sqle.getMessage(),sqle,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Error in isClob("+col+"): "+sqle.getMessage(),sqle,LCFException.DATABASE_ERROR);
 		}
 	}
 
 	protected static Object getObject(ResultSet rs, ResultSetMetaData rsmd, int col)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		Object result = null;
 
@@ -770,7 +770,7 @@
 				case java.sql.Types.VARBINARY:
 				case java.sql.Types.BINARY:
 				case java.sql.Types.LONGVARBINARY:
-					throw new MetacartaException("Binary type is not a string, column = " + col,MetacartaException.GENERAL_ERROR);
+					throw new LCFException("Binary type is not a string, column = " + col,LCFException.GENERAL_ERROR);
 					//break
 
 				default :
@@ -784,7 +784,7 @@
 		}
 		catch (java.sql.SQLException e)
 		{
-			throw new MetacartaException("Exception in getString(): "+e.getMessage(),e,MetacartaException.DATABASE_ERROR);
+			throw new LCFException("Exception in getString(): "+e.getMessage(),e,LCFException.DATABASE_ERROR);
 		}
 		return result;
 	}
@@ -800,7 +800,7 @@
 		
 		/** Constructor */
 		public JDBCResultSet(String query, int maxResults)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			this.maxResults = maxResults;
 			StatementQueryThread t = new StatementQueryThread(query);
@@ -812,9 +812,9 @@
 				if (thr != null)
 				{
 					if (thr instanceof java.sql.SQLException)
-						throw new MetacartaException("Exception doing connector query '"+query+"': "+thr.getMessage(),thr);
-					else if (thr instanceof MetacartaException)
-						throw (MetacartaException)thr;
+						throw new LCFException("Exception doing connector query '"+query+"': "+thr.getMessage(),thr);
+					else if (thr instanceof LCFException)
+						throw (LCFException)thr;
                                         else if (thr instanceof ServiceInterruption)
                                                 throw (ServiceInterruption)thr;
 					else if (thr instanceof RuntimeException)
@@ -831,7 +831,7 @@
 			catch (InterruptedException e)
 			{
 				t.interrupt();
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 		}
 		
@@ -839,7 +839,7 @@
 		*@return the immutable row description, or null if there is no such row.
 		*/
 		public IResultRow getNextRow()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			if (maxResults == -1 || maxResults > 0)
 			{
@@ -854,9 +854,9 @@
 		/** Close this resultset.
 		*/
 		public void close()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
-			MetacartaException rval = null;
+			LCFException rval = null;
 			if (rs != null)
 			{
 				try
@@ -864,9 +864,9 @@
 					closeResultset(rs);
 					rs = null;
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
 			}
@@ -877,9 +877,9 @@
 					closeStmt(stmt);
 					stmt = null;
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
 			}
@@ -890,9 +890,9 @@
 					JDBCConnectionFactory.releaseConnection(connection);
 					connection = null;
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
 			}
@@ -944,9 +944,9 @@
                                         catch (ServiceInterruption e2)
                                         {
                                         }
-					catch (MetacartaException e2)
+					catch (LCFException e2)
 					{
-						if (e2.getErrorCode() == MetacartaException.INTERRUPTED)
+						if (e2.getErrorCode() == LCFException.INTERRUPTED)
 							this.exception = e2;
 						// Ignore
 					}
@@ -964,9 +964,9 @@
                                         catch (ServiceInterruption e2)
                                         {
                                         }
-					catch (MetacartaException e2)
+					catch (LCFException e2)
 					{
-						if (e2.getErrorCode() == MetacartaException.INTERRUPTED)
+						if (e2.getErrorCode() == LCFException.INTERRUPTED)
 							this.exception = e2;
 						// Ignore
 					}
@@ -984,9 +984,9 @@
                                         catch (ServiceInterruption e2)
                                         {
                                         }
-					catch (MetacartaException e2)
+					catch (LCFException e2)
 					{
-						if (e2.getErrorCode() == MetacartaException.INTERRUPTED)
+						if (e2.getErrorCode() == LCFException.INTERRUPTED)
 							this.exception = e2;
 						// Otherwise, ignore
 					}
@@ -1041,7 +1041,7 @@
 
 		/** Constructor */
 		public JDBCPSResultSet(String query, ArrayList params, int maxResults)
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			this.maxResults = maxResults;
 			this.params = params;
@@ -1056,9 +1056,9 @@
 					// Cleanup of parameters happens even if exception doing query
 					cleanupParameters(params);
 					if (thr instanceof java.sql.SQLException)
-						throw new MetacartaException("Exception doing connector query '"+query+"': "+thr.getMessage(),thr);
-					else if (thr instanceof MetacartaException)
-						throw (MetacartaException)thr;
+						throw new LCFException("Exception doing connector query '"+query+"': "+thr.getMessage(),thr);
+					else if (thr instanceof LCFException)
+						throw (LCFException)thr;
                                         else if (thr instanceof ServiceInterruption)
                                                 throw (ServiceInterruption)thr;
 					else if (thr instanceof RuntimeException)
@@ -1076,7 +1076,7 @@
 			{
 				cleanupParameters(params);
 				t.interrupt();
-				throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+				throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 			}
 		}
 		
@@ -1084,7 +1084,7 @@
 		*@return the immutable row description, or null if there is no such row.
 		*/
 		public IResultRow getNextRow()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
 			if (maxResults == -1 || maxResults > 0)
 			{
@@ -1099,9 +1099,9 @@
 		/** Close this resultset.
 		*/
 		public void close()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{
-			MetacartaException rval = null;
+			LCFException rval = null;
 			if (rs != null)
 			{
 				try
@@ -1111,9 +1111,9 @@
                                 catch (ServiceInterruption e)
                                 {
                                 }
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
                                 finally
@@ -1130,9 +1130,9 @@
                                 catch (ServiceInterruption e)
                                 {
                                 }
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
                                 finally
@@ -1149,9 +1149,9 @@
                                 catch (ServiceInterruption e)
                                 {
                                 }
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
                                 finally
@@ -1166,9 +1166,9 @@
 					cleanupParameters(params);
 					params = null;
 				}
-				catch (MetacartaException e)
+				catch (LCFException e)
 				{
-					if (rval == null || e.getErrorCode() == MetacartaException.INTERRUPTED)
+					if (rval == null || e.getErrorCode() == LCFException.INTERRUPTED)
 						rval = e;
 				}
 			}
@@ -1222,9 +1222,9 @@
                                         catch (ServiceInterruption e2)
                                         {
                                         }
-					catch (MetacartaException e2)
+					catch (LCFException e2)
 					{
-						if (e2.getErrorCode() == MetacartaException.INTERRUPTED)
+						if (e2.getErrorCode() == LCFException.INTERRUPTED)
 							this.exception = e2;
 					}
                                         finally
@@ -1241,9 +1241,9 @@
                                         catch (ServiceInterruption e2)
                                         {
                                         }
-					catch (MetacartaException e2)
+					catch (LCFException e2)
 					{
-						if (e2.getErrorCode() == MetacartaException.INTERRUPTED)
+						if (e2.getErrorCode() == LCFException.INTERRUPTED)
 							this.exception = e2;
 					}
                                         finally
@@ -1260,9 +1260,9 @@
                                         catch (ServiceInterruption e2)
                                         {
                                         }
-					catch (MetacartaException e2)
+					catch (LCFException e2)
 					{
-						if (e2.getErrorCode() == MetacartaException.INTERRUPTED)
+						if (e2.getErrorCode() == LCFException.INTERRUPTED)
 							this.exception = e2;
 					}
                                         finally



Mime
View raw message