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 [4/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
Added: incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LCFMemexConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LCFMemexConnection.java?rev=911029&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LCFMemexConnection.java (added)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LCFMemexConnection.java Wed Feb 17 15:57:27 2010
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.apache.lcf.crawler.connectors.memex;
+
+import com.memex.mie.*;
+
+
+/**
+ *
+ * @author mxadmin
+ */
+class LCFMemexConnection{
+
+    /**Class to extend the regular MemexConnection to deal with
+     * the fact the LCF connect method doesn't report authentication
+     * failure immediately.
+     */
+
+    protected String ConnectionMessage = "No connection attempted";
+    protected RegistryEntry[] localRegistry = null;
+    protected MemexConnection mie = null;
+    protected String name = "";
+    protected long checkExpireTime = -1L;
+  
+
+    LCFMemexConnection(){
+
+    }
+
+    protected boolean isConnected(){
+
+        try{
+            if(mie.isConnected()){
+                long currentTime = System.currentTimeMillis();
+                if (checkExpireTime == -1L || currentTime >= checkExpireTime)
+                {
+                    String mytest = mie.mxie_environment_get("MXIE_CURRENT_USER");
+                    // Don't try this again for at least a minute; it's unnecessary and way too slow
+                    checkExpireTime = currentTime + 60000L;
+                }
+                return true;
+            }else{
+                checkExpireTime = -1L;
+                return false;
+            }
+        }
+        catch(MemexException mex){
+            checkExpireTime = -1L;
+            return false;
+        }
+        catch(java.lang.NullPointerException e){
+            checkExpireTime = -1L;
+            return false;
+        }
+    }
+
+}

Modified: incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LogicalServer.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LogicalServer.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LogicalServer.java (original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/LogicalServer.java Wed Feb 17 15:57:27 2010
@@ -34,13 +34,13 @@
 
     private String servername;
     private String prefix;
-    private MetacartaMemexConnection mie;
+    private LCFMemexConnection mie;
     private RegistryEntry[] databases;
     private boolean active = false;
     private Map<String,RegistryEntry> databasesByName = new HashMap<String,RegistryEntry>();
     private Map<String,Map<String,DatabaseField>> fieldsByDatabaseName = new HashMap<String,Map<String,DatabaseField>>();
 
-    public LogicalServer(String name, String urnPrefix, MetacartaMemexConnection serverMIE, Map<String,MemexEntity> entitiesByName)
+    public LogicalServer(String name, String urnPrefix, LCFMemexConnection serverMIE, Map<String,MemexEntity> entitiesByName)
         throws MemexException
     {
         servername = name;
@@ -93,7 +93,7 @@
         return prefix;
     }
     
-    public MetacartaMemexConnection getMIE()
+    public LCFMemexConnection getMIE()
     {
         return mie;
     }

Modified: incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java (original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
 import org.apache.lcf.agents.interfaces.*;
 import org.apache.lcf.authorities.interfaces.*;
 import org.apache.lcf.authorities.system.Logging;
-import org.apache.lcf.authorities.system.Metacarta;
+import org.apache.lcf.authorities.system.LCF;
 import com.memex.mie.*;
 import com.memex.mie.pool.*;
 import java.util.*;
@@ -69,9 +69,9 @@
         protected String characterEncoding = null;
 
         //mieConnection is the connection to the main Configuration Server.
-        //There will be further MetacartaMemexConnection objects for each
+        //There will be further LCFMemexConnection objects for each
         //physical server accessed through the physicalServers collection.
-        private MetacartaMemexConnection mieConnection = null;
+        private LCFMemexConnection mieConnection = null;
         private MemexConnectionPool miePool = new MemexConnectionPool();
 
         //Collection describing the logical servers making up this system
@@ -79,7 +79,7 @@
         private Hashtable<String, LogicalServer> logicalServersByPrefix = null;
 
         //Collection describing the physical servers making up this system
-        private Hashtable<String, MetacartaMemexConnection> physicalServers = null;
+        private Hashtable<String, LCFMemexConnection> physicalServers = null;
 
         //Two collections describing the entities in the set-up - one keyed by the entities' name, the other
         //by their label - generally speaking, we should use labels for anything being presented to the users
@@ -140,7 +140,7 @@
         /** Check connection for sanity.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
                 try{
                     this.setupConnection();
@@ -155,7 +155,7 @@
         * in active use.
         */
         public void poll()
-                throws MetacartaException
+                throws LCFException
         {
                 // Is the connection still valid?
                 if (this.physicalServers != null && !this.physicalServers.isEmpty())
@@ -173,7 +173,7 @@
         /** Close the connection.  Call this before discarding the repository connector.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {
                 matchMap = null;
                 this.cleanUpConnections();
@@ -191,7 +191,7 @@
         * (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
         */
         public AuthorizationResponse getAuthorizationResponse(String userName)
-                throws MetacartaException
+                throws LCFException
         {
 
                 Hashtable<String,Hashtable<String, String>> userDBList = new Hashtable<String,Hashtable<String, String>>();
@@ -210,9 +210,9 @@
                     this.setupConnection();
                 }
                 catch(ServiceInterruption mex){
-                    //something transient's gone wrong connecting.  Throw a MetacartaException (which will be caught, and the appropriate default behavior instigated).
+                    //something transient's gone wrong connecting.  Throw a LCFException (which will be caught, and the appropriate default behavior instigated).
                     Logging.authorityConnectors.warn("Memex: Transient authority error: "+mex.getMessage(),mex.getCause());
-                    throw new MetacartaException(mex.getMessage(),mex.getCause());
+                    throw new LCFException(mex.getMessage(),mex.getCause());
                 }
 
                 //Next - search for the user's record in the mxUserGroup database
@@ -250,7 +250,7 @@
                                 //This shouldn't happen - should only be one entry per user
                                 if (Logging.authorityConnectors.isDebugEnabled())
                                         Logging.authorityConnectors.warn("Memex: Multiple entries found for '"+userName+"'!");
-                                throw new MetacartaException("Memex Error retrieving user information : multiple entries found for user " + userName);
+                                throw new LCFException("Memex Error retrieving user information : multiple entries found for user " + userName);
                             }else{
                                 //OK - we found the user - we need four fields from thier record - groups, servers, attributes and keys
                                 if (Logging.authorityConnectors.isDebugEnabled())
@@ -364,18 +364,18 @@
                         }else{
                             //This is bad - we're connected, but we can't find the UserGroup database
                             Logging.authorityConnectors.error("Memex: Can't locate UserGroup database.");
-                            throw new MetacartaException("Memex Error: Can't locate the mxUserGroup Database");
+                            throw new LCFException("Memex Error: Can't locate the mxUserGroup Database");
                         }
                     }else{
                         //This is bad as well - we're connected but didn't find any registry entries
                         Logging.authorityConnectors.error("Memex: Configuration Server's registry appears to be null.");
-                        throw new MetacartaException("Memex Error: Configuration Server's registry is null");
+                        throw new LCFException("Memex Error: Configuration Server's registry is null");
                     }
                 }catch(MemexException me){
                     //something threw an error - most likely a connection issue.
-                    // MetacartaExceptions will be handled by getting the default authorization response instead.
+                    // LCFExceptions will be handled by getting the default authorization response instead.
                     Logging.authorityConnectors.warn("Memex: Unknown error calculating user access tokens: "+me.getMessage(),me);
-                    throw new MetacartaException("Memex transient error: "+me.getMessage(),me);
+                    throw new LCFException("Memex transient error: "+me.getMessage(),me);
                 }
         }
 
@@ -396,7 +396,7 @@
         //
         ///////////////////////////////////////////////////////////////////////
         public void setupConnection()
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 boolean connected = false;
                 if((this.physicalServers != null) && !(this.physicalServers.isEmpty())){
@@ -404,7 +404,7 @@
                     connected = true;
                     for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
                         String serverkey = (String)serverkeys.nextElement();
-                        MetacartaMemexConnection pserver = physicalServers.get(serverkey);
+                        LCFMemexConnection pserver = physicalServers.get(serverkey);
                         if(!(pserver.isConnected())){
                             connected = false;
                         }
@@ -424,10 +424,10 @@
                         miePool.setCharset(characterEncoding);
 
                         //Initialise data structures
-                        mieConnection = new MetacartaMemexConnection();
+                        mieConnection = new LCFMemexConnection();
                         logicalServers = new Hashtable<String, LogicalServer>();
                         logicalServersByPrefix = new Hashtable<String, LogicalServer>();
-                        physicalServers = new Hashtable<String, MetacartaMemexConnection>();
+                        physicalServers = new Hashtable<String, LCFMemexConnection>();
                         entitiesByName = new Hashtable<String, MemexEntity>();
                         entitiesByLabel = new Hashtable<String, MemexEntity>();
                         entitiesByPrefix = new Hashtable<String, MemexEntity>();
@@ -460,7 +460,7 @@
                         roleGroups = this.initialiseRoleGroups();
                     }
                     catch(PoolAuthenticationException e){
-                        throw new MetacartaException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
+                        throw new LCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
                     }
                     catch(PoolException e){
                         Logging.authorityConnectors.warn("Memex: Pool error connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " - " + e.getMessage() + " - retrying",e);
@@ -501,7 +501,7 @@
                     while (i < serverKeyArray.length)
                     {
                         String serverkey = serverKeyArray[i++];
-                        MetacartaMemexConnection currentMIE = physicalServers.get(serverkey);
+                        LCFMemexConnection currentMIE = physicalServers.get(serverkey);
                         try{
                             // Remove history directories belonging to this session
                             physicalServers.remove(serverkey);
@@ -529,7 +529,7 @@
 
                     for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
                         String serverkey = (String)serverkeys.nextElement();
-                        MetacartaMemexConnection currentMIE = physicalServers.get(serverkey);
+                        LCFMemexConnection currentMIE = physicalServers.get(serverkey);
                         try{
                             // Remove history directories belonging to this session
                             String histdir = currentMIE.mie.mxie_history_current();
@@ -669,7 +669,7 @@
                         serverFields.add(serversource);
                         //mieConnection.mie.mxie_goto_record(hist, x);
                         mieConnection.mie.mxie_decode_fields(serverFields);
-                        MetacartaMemexConnection mie;
+                        LCFMemexConnection mie;
                         if(serversource.getText().equals("configuration-server")){
                             mie = mieConnection;
                         }else{
@@ -886,14 +886,14 @@
 
 
 
-    private MetacartaMemexConnection getPhysicalServer(String server, int port){
+    private LCFMemexConnection getPhysicalServer(String server, int port){
 
         String key = server + ":" + Integer.toString(port);
 
         if(physicalServers.containsKey(key)){
-            return (MetacartaMemexConnection)physicalServers.get(key);
+            return (LCFMemexConnection)physicalServers.get(key);
         }else{
-            MetacartaMemexConnection newServer = new MetacartaMemexConnection();
+            LCFMemexConnection newServer = new LCFMemexConnection();
             try{
                 MemexConnection newMIE = miePool.getConnection(server, port);
                 newServer.mie = newMIE;

Modified: incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java Wed Feb 17 15:57:27 2010
@@ -23,7 +23,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;
 import java.util.*;
 import java.io.*;
 import org.w3c.dom.*;
@@ -99,9 +99,9 @@
         protected String webServerPort = null;
 
         //mieConnection is the connection to the main Configuration Server.
-        //There will be further MetacartaMemexConnection objects for each
+        //There will be further LCFMemexConnection objects for each
         //physical server accessed through the physicalServers collection.
-        private MetacartaMemexConnection mieConnection = null;
+        private LCFMemexConnection mieConnection = null;
         private MemexConnectionPool miePool = new MemexConnectionPool();
 
         //Collection describing the logical servers making up this system
@@ -109,7 +109,7 @@
         private Hashtable<String, LogicalServer> logicalServersByPrefix = null;
 
         //Collection describing the physical servers making up this system
-        private Hashtable<String, MetacartaMemexConnection> physicalServers = null;
+        private Hashtable<String, LCFMemexConnection> physicalServers = null;
 
         //Two collections describing the entities in the set-up - one keyed by the entities' name, the other
         //by their label - generally speaking, we should use labels for anything being presented to the users
@@ -199,7 +199,7 @@
                     }
                     return new String[]{""};
                 }
-                catch(MetacartaException e){
+                catch(LCFException e){
                     Logging.connectors.warn("Memex connection error: "+e.getMessage(),e);
                     return new String[]{""};
                 }
@@ -249,7 +249,7 @@
         *@return the connection's status as a displayable string.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
                 try{
                     this.setupConnection();
@@ -264,7 +264,7 @@
         * in active use.
         */
         public void poll()
-                throws MetacartaException
+                throws LCFException
         {
                 // Is the connection still valid?
                 if (this.physicalServers != null && !this.physicalServers.isEmpty())
@@ -283,7 +283,7 @@
         /** Disconnect from Memex.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {
                 this.cleanUpConnections();
                 userName = null;
@@ -339,7 +339,7 @@
         */
         public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
                 long startTime, long endTime)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 //start by making sure we have a connection
                 this.setupConnection();
@@ -525,11 +525,11 @@
                             {
                                 try
                                 {
-                                    Metacarta.sleep(100L);
+                                    LCF.sleep(100L);
                                 }
                                 catch (InterruptedException e)
                                 {
-                                    throw new MetacartaException(e.getMessage(),e,MetacartaException.INTERRUPTED);
+                                    throw new LCFException(e.getMessage(),e,LCFException.INTERRUPTED);
                                 }
                             }
                         }
@@ -546,7 +546,7 @@
         }
 
         protected static boolean checkCriteria(Map<String,DecodedField> fields, List<CrawlMatchDescription> specificMatchCriteria)
-                throws MetacartaException
+                throws LCFException
         {
                 // An empty array means EVERYTHING.
                 if (specificMatchCriteria.size() == 0)
@@ -594,7 +594,7 @@
                                         return true;
                                 }
                                 else
-                                    throw new MetacartaException("Bad operator value: "+operator);
+                                    throw new LCFException("Bad operator value: "+operator);
                         }
                 }
                 return false;
@@ -602,7 +602,7 @@
         
         protected void doDecode(ArrayList fieldListX, List<Map<String,DecodedField>> fieldsPerRecord, List<CrawlMatchDescription> specificMatchCriteria,
                 LogicalServer ls, ISeedingActivity activities)
-                throws MemexException, MetacartaException
+                throws MemexException, LCFException
         {
                 // First, do the decode
                 ls.getMIE().mie.mxie_decode_fields(fieldListX);
@@ -699,7 +699,7 @@
         */
         public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activity,
                 DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 String[] newVersions = new String[documentIdentifiers.length];
                 // Build a hash of the indices for each document identifier
@@ -1130,7 +1130,7 @@
         */
         public void processDocuments(String[] documentIdentifiers, String[] documentVersions,
                 IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
 
                 // First, create the CrawlDescription object
@@ -1162,7 +1162,7 @@
                                 Hashtable currentRec = lookupCachedRecord(recordURN);
                                 if (currentRec == null)
                                     // This should never happen!!
-                                    throw new MetacartaException("Process request for a record whose version was never requested!!");
+                                    throw new LCFException("Process request for a record whose version was never requested!!");
 
                                 // Now, unpack the version string to obtain what fields we should ingest etc.
                                 ArrayList<String> primaryList = new ArrayList<String>();
@@ -1320,7 +1320,7 @@
                         }
                     }
                 }catch(java.io.UnsupportedEncodingException e){
-                    throw new MetacartaException("Unsupported encoding: "+e.getMessage(),e);
+                    throw new LCFException("Unsupported encoding: "+e.getMessage(),e);
                 }
 
         }
@@ -1373,7 +1373,7 @@
         *@param versions is the corresponding set of version identifiers (individual identifiers may be null).
         */
         public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
-                throws MetacartaException
+                throws LCFException
         {
                 // Clean up our part of the cache.
                 for (int i = 0; i < documentIdentifiers.length; i++)
@@ -1393,7 +1393,7 @@
 
         /** Return a list of databases (instances of an entity type) on a given virtual server*/
         public NameDescription[] listDatabasesForVirtualServer(String virtualServerName)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 //Start by making sure we're connected
                 this.setupConnection();
@@ -1402,11 +1402,11 @@
                 if(!(logicalServers.containsKey(virtualServerName))){
                     //If we can't find the virtual server, its unlikely we can
                     //recover
-                    throw new MetacartaException("Memex error: Virtual server "+virtualServerName+" not found");
+                    throw new LCFException("Memex error: Virtual server "+virtualServerName+" not found");
                 }
                 LogicalServer ls = logicalServers.get(virtualServerName);
                 if (ls == null)
-                    throw new MetacartaException("Memex error: Virtual server "+virtualServerName+" not found");
+                    throw new LCFException("Memex error: Virtual server "+virtualServerName+" not found");
 
                 ArrayList<String> dblist = new ArrayList<String>();
                 for(int i = 0; i < ls.getDatabaseCount(); i++){
@@ -1435,7 +1435,7 @@
 
         /** Return a list of virtual servers for the connection, in sorted alphabetic order */
         public String[] listVirtualServers()
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 //Start by making sure we're connected
                 this.setupConnection();
@@ -1468,7 +1468,7 @@
 
         /** Return a list of the entity types there are for the connection, in sorted alphabetic order */
         public NameDescription[] listEntityTypes()
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 //Start by making sure we're connected
                 this.setupConnection();
@@ -1505,7 +1505,7 @@
 
         /** Return a list of the field names for the entity prefix in the implied connection, in sorted alphabetic order */
         public String[] listFieldNames(String entityPrefix)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 //Start by making sure we're connected
                 this.setupConnection();
@@ -1515,12 +1515,12 @@
                     if (entity != null)
                         return entity.getFields();
                 }
-                throw new MetacartaException("Entity type '"+entityPrefix+"' does not exist");
+                throw new LCFException("Entity type '"+entityPrefix+"' does not exist");
         }
 
         /** Return a list of the field names that mie can directly fetch from a record (for document specification) */
         public String[] listMatchableFieldNames(String entityPrefix)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 String[] candidates = listFieldNames(entityPrefix);
                 if (candidates == null)
@@ -1666,7 +1666,7 @@
         //
         ///////////////////////////////////////////////////////////////////////
         private void setupConnection()
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
 
                 boolean connected = false;
@@ -1675,7 +1675,7 @@
                     connected = true;
                     for(Enumeration serverkeys = physicalServers.keys(); serverkeys.hasMoreElements();){
                         String serverkey = (String)serverkeys.nextElement();
-                        MetacartaMemexConnection pserver = physicalServers.get(serverkey);
+                        LCFMemexConnection pserver = physicalServers.get(serverkey);
                         if(!(pserver.isConnected())){
                             connected = false;
                         }
@@ -1695,10 +1695,10 @@
                         miePool.setCharset(characterEncoding);
 
                         //Initialise data structures
-                        mieConnection = new MetacartaMemexConnection();
+                        mieConnection = new LCFMemexConnection();
                         logicalServers = new Hashtable<String, LogicalServer>();
                         logicalServersByPrefix = new Hashtable<String, LogicalServer>();
-                        physicalServers = new Hashtable<String, MetacartaMemexConnection>();
+                        physicalServers = new Hashtable<String, LCFMemexConnection>();
                         entitiesByName = new Hashtable<String, MemexEntity>();
                         entitiesByLabel = new Hashtable<String, MemexEntity>();
                         entitiesByPrefix = new Hashtable<String, MemexEntity>();
@@ -1726,7 +1726,7 @@
 
                     }
                     catch(PoolAuthenticationException e){
-                        throw new MetacartaException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
+                        throw new LCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort())+": "+e.getMessage(),e);
                     }
                     catch(PoolException e){
                         Logging.connectors.warn("Memex: Pool error connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " - " + e.getMessage() + " - retrying",e);
@@ -1766,7 +1766,7 @@
                     while (i < serverKeyArray.length)
                     {
                         String serverkey = serverKeyArray[i++];
-                        MetacartaMemexConnection currentMIE = physicalServers.get(serverkey);
+                        LCFMemexConnection currentMIE = physicalServers.get(serverkey);
                         try{
                             // Remove history directories belonging to this session
                             physicalServers.remove(serverkey);
@@ -1796,7 +1796,7 @@
         /**Creates an alphabetically ordered list of entity objects.
         */
         private void getEntities()
-                throws MemexException, MetacartaException, ServiceInterruption
+                throws MemexException, LCFException, ServiceInterruption
         {
                 String mxEntityPath = null;
                 String[] entityReturn = new String[1];
@@ -1866,11 +1866,11 @@
                                             // Parse it!
                                             entityForm = db.parse(formStream);
                                         }catch(ParserConfigurationException e){
-                                            throw new MetacartaException("Can't find a valid parser: "+e.getMessage(),e);
+                                            throw new LCFException("Can't find a valid parser: "+e.getMessage(),e);
                                         }catch(SAXException e){
-                                            throw new MetacartaException("XML had parse errors: "+e.getMessage(),e);
+                                            throw new LCFException("XML had parse errors: "+e.getMessage(),e);
                                         }catch(InterruptedIOException e){
-                                            throw new MetacartaException(e.getMessage(),e,MetacartaException.INTERRUPTED);
+                                            throw new LCFException(e.getMessage(),e,LCFException.INTERRUPTED);
                                         }catch(IOException e){
                                             // I/O problem; treat as  a service interruption
                                             long currentTime = System.currentTimeMillis();
@@ -1885,11 +1885,11 @@
                                             }
                                             catch (InterruptedIOException e)
                                             {
-                                                throw new MetacartaException(e.getMessage(),e,MetacartaException.INTERRUPTED);
+                                                throw new LCFException(e.getMessage(),e,LCFException.INTERRUPTED);
                                             }
                                             catch (IOException e)
                                             {
-                                                throw new MetacartaException("Error reading memex form data: "+e.getMessage(),e);
+                                                throw new LCFException("Error reading memex form data: "+e.getMessage(),e);
                                             }
                                         }
                                     }catch(MemexException e){
@@ -1969,7 +1969,7 @@
                                 serverFields.add(serversource);
                                 //mieConnection.mie.mxie_goto_record(hist, x);
                                 mieConnection.mie.mxie_decode_fields(serverFields);
-                                MetacartaMemexConnection mie;
+                                LCFMemexConnection mie;
                                 if(serversource.getText().equals("configuration-server")){
                                     mie = mieConnection;
                                 }else{
@@ -1990,14 +1990,14 @@
                 }
         }
 
-        private MetacartaMemexConnection getPhysicalServer(String server, int port){
+        private LCFMemexConnection getPhysicalServer(String server, int port){
 
                 String key = server + ":" + Integer.toString(port);
 
                 if(physicalServers.containsKey(key)){
-                    return (MetacartaMemexConnection)physicalServers.get(key);
+                    return (LCFMemexConnection)physicalServers.get(key);
                 }else{
-                    MetacartaMemexConnection newServer = new MetacartaMemexConnection();
+                    LCFMemexConnection newServer = new LCFMemexConnection();
                     try{
                         MemexConnection newMIE = miePool.getConnection(server, port);
                         newServer.mie = newMIE;
@@ -2120,7 +2120,7 @@
         * @return - the hash table representation of the record. Null if its not found
         */
         private Hashtable getmxRecordObj(LogicalServer ls, int histno, int recnum)
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 Hashtable mxRecord = null;
                 try{
@@ -2289,7 +2289,7 @@
                     }
                     catch (InterruptedIOException eek)
                     {
-                        throw new MetacartaException(eek.getMessage(),eek,MetacartaException.INTERRUPTED);
+                        throw new LCFException(eek.getMessage(),eek,LCFException.INTERRUPTED);
                     }
                     catch (IOException eek) {
                         // Treat this as a service interruption
@@ -2313,15 +2313,15 @@
                 }
                 catch (UnsupportedEncodingException e){
                         Logging.connectors.error("Memex: "+e.getMessage(),e);
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
                 catch (InterruptedIOException e)
                 {
-                        throw new MetacartaException(e.getMessage(),e,MetacartaException.INTERRUPTED);
+                        throw new LCFException(e.getMessage(),e,LCFException.INTERRUPTED);
                 }
                 catch (IOException e)
                 {
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
         }
 

Modified: incubator/lcf/trunk/modules/connectors/memex/crawler-ui/connectors/memex/editspec.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/crawler-ui/connectors/memex/editspec.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/crawler-ui/connectors/memex/editspec.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/memex/crawler-ui/connectors/memex/editspec.jsp Wed Feb 17 15:57:27 2010
@@ -217,7 +217,7 @@
 			RepositoryConnectorFactory.release(connector);
 		}
 	}
-	catch (MetacartaException e)
+	catch (LCFException e)
 	{
 %>
 		<tr>
@@ -486,7 +486,7 @@
 				RepositoryConnectorFactory.release(connector);
 			}
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 %>
 							<%=org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())%>
@@ -551,7 +551,7 @@
 					RepositoryConnectorFactory.release(connector);
 				}
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 %>
 							<%=org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())%>
@@ -630,7 +630,7 @@
 					RepositoryConnectorFactory.release(connector);
 				}
 			}
-			catch (MetacartaException e)
+			catch (LCFException e)
 			{
 %>
 							<%=org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())%>

Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioAuthority.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioAuthority.java Wed Feb 17 15:57:27 2010
@@ -117,7 +117,7 @@
         
         /** Set up connection before attempting to use it */
         protected void attemptToConnect()
-                throws MetacartaException
+                throws LCFException
         {
                 if (meridio_ == null)
                 {
@@ -130,7 +130,7 @@
 
                         String DMWSProtocol = params.getParameter("DMWSServerProtocol");
                         if (DMWSProtocol == null)
-                                throw new MetacartaException("Missing required configuration parameter: DMWSServerProtocol");
+                                throw new LCFException("Missing required configuration parameter: DMWSServerProtocol");
                         String DMWSPort = params.getParameter("DMWSServerPort");
                         if (DMWSPort == null || DMWSPort.length() == 0)
                                 DMWSPort = "";
@@ -144,7 +144,7 @@
                                 
                         String RMWSProtocol = params.getParameter("RMWSServerProtocol");
                         if (RMWSProtocol == null)
-                                throw new MetacartaException("Missing required configuration parameter: RMWSServerProtocol");
+                                throw new LCFException("Missing required configuration parameter: RMWSServerProtocol");
                         String RMWSPort = params.getParameter("RMWSServerPort");
                         if (RMWSPort == null || RMWSPort.length() == 0)
                                 RMWSPort = "";
@@ -158,14 +158,14 @@
                                 
                         String MetaCartaWSProtocol = params.getParameter("MetaCartaWSServerProtocol");
                         if (MetaCartaWSProtocol == null)
-                                throw new MetacartaException("Missing required configuration parameter: MetaCartaWSServerProtocol");
+                                throw new LCFException("Missing required configuration parameter: MetaCartaWSServerProtocol");
                         String MetaCartaWSPort = params.getParameter("MetaCartaWSServerPort");
                         if (MetaCartaWSPort == null || MetaCartaWSPort.length() == 0)
                                 MetaCartaWSPort = "";
                         else
                                 MetaCartaWSPort = ":" + MetaCartaWSPort;
 
-                        String MetacartaWSUrlString = MetaCartaWSProtocol + "://" +
+                        String LCFWSUrlString = MetaCartaWSProtocol + "://" +
                                 params.getParameter("MetaCartaWSServerName") +
                                 MetaCartaWSPort +
                                 params.getParameter("MetaCartaWSLocation");
@@ -187,7 +187,7 @@
                         {								
                                 DmwsURL = new URL(DMWSUrlString);						
                                 RmwsURL = new URL(RMWSUrlString);			       		 
-                                MetaCartawsURL = new URL(MetacartaWSUrlString);
+                                MetaCartawsURL = new URL(LCFWSUrlString);
                                 
                                 if (Logging.authorityConnectors.isDebugEnabled())
                                 {
@@ -199,7 +199,7 @@
                         }
                         catch (MalformedURLException malformedURLException)
                         {			
-                                throw new MetacartaException("Meridio: Could not construct the URL for either " +
+                                throw new LCFException("Meridio: Could not construct the URL for either " +
                                         "the Meridio DM, Meridio RM, or MetaCarta Meridio Web Service: "+malformedURLException, malformedURLException);
                         }
                         
@@ -218,7 +218,7 @@
                         }
                         catch (UnknownHostException unknownHostException)
                         {
-                                throw new MetacartaException("Meridio: A Unknown Host Exception occurred while " +
+                                throw new LCFException("Meridio: A Unknown Host Exception occurred while " +
                                         "connecting - is a network software and hardware configuration: "+unknownHostException.getMessage(), unknownHostException);
                         }
                         catch (org.apache.axis.AxisFault e)
@@ -231,23 +231,23 @@
                                         {
                                                 elem.normalize();
                                                 String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-                                                throw new MetacartaException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+                                                throw new LCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
                                         }
-                                        throw new MetacartaException("Unknown http error occurred while connecting: "+e.getMessage(),e);
+                                        throw new LCFException("Unknown http error occurred while connecting: "+e.getMessage(),e);
                                 }
                                 if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
                                 {
                                         String exceptionName = e.getFaultString();
                                         if (exceptionName.equals("java.lang.InterruptedException"))
-                                                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                                                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
                                 }
                                 if (Logging.authorityConnectors.isDebugEnabled())
                                         Logging.authorityConnectors.debug("Meridio: Got an unknown remote exception connecting - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
-                                throw new MetacartaException("Remote procedure exception: "+e.getMessage(),e);
+                                throw new LCFException("Remote procedure exception: "+e.getMessage(),e);
                         }
                         catch (RemoteException remoteException)
                         {			
-                                throw new MetacartaException("Meridio: An unknown remote exception occurred while " +
+                                throw new LCFException("Meridio: An unknown remote exception occurred while " +
                                         "connecting: "+remoteException.getMessage(), remoteException);
                         }
 
@@ -261,7 +261,7 @@
         /** Check connection for sanity.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
                 Logging.authorityConnectors.debug("Meridio: Entering 'check' method");
                 attemptToConnect();
@@ -322,7 +322,7 @@
                         {
                                 String exceptionName = e.getFaultString();
                                 if (exceptionName.equals("java.lang.InterruptedException"))
-                                        throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                                        throw new LCFException("Interrupted",LCFException.INTERRUPTED);
                         }
                         if (Logging.authorityConnectors.isDebugEnabled())
                                 Logging.authorityConnectors.debug("Meridio: Got an unknown remote exception checking - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
@@ -356,7 +356,7 @@
         /** Close the connection.  Call this before discarding the repository connector.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {		
                 Logging.authorityConnectors.debug("Meridio: Entering 'disconnect' method");
                 try
@@ -386,7 +386,7 @@
                         {
                                 String exceptionName = e.getFaultString();
                                 if (exceptionName.equals("java.lang.InterruptedException"))
-                                        throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                                        throw new LCFException("Interrupted",LCFException.INTERRUPTED);
                         }
                         if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
                         {
@@ -433,7 +433,7 @@
         * (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
         */
         public AuthorizationResponse getAuthorizationResponse(String userName)
-                throws MetacartaException
+                throws LCFException
         {
                 if (Logging.authorityConnectors.isDebugEnabled())
                         Logging.authorityConnectors.debug("Meridio: Authentication user name = '" + userName + "'");	
@@ -552,15 +552,15 @@
                                         {
                                                 elem.normalize();
                                                 String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-                                                throw new MetacartaException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+                                                throw new LCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
                                         }
-                                        throw new MetacartaException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
+                                        throw new LCFException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
                                 }
                                 if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
                                 {
                                         String exceptionName = e.getFaultString();
                                         if (exceptionName.equals("java.lang.InterruptedException"))
-                                                throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+                                                throw new LCFException("Interrupted",LCFException.INTERRUPTED);
                                 }
                                 if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
                                 {
@@ -574,18 +574,18 @@
 
                                 if (Logging.authorityConnectors.isDebugEnabled())
                                         Logging.authorityConnectors.debug("Meridio: Got an unknown remote exception getting user tokens - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
-                                throw new MetacartaException("Axis fault: "+e.getMessage(),  e);
+                                throw new LCFException("Axis fault: "+e.getMessage(),  e);
                         }
                         catch (RemoteException remoteException)
                         {
-                                throw new MetacartaException("Meridio: A remote exception occurred while getting user tokens: " +
+                                throw new LCFException("Meridio: A remote exception occurred while getting user tokens: " +
                                         remoteException.getMessage(), remoteException);
                         }
                         catch (MeridioDataSetException meridioDataSetException)
                         {
                                 Logging.authorityConnectors.error("Meridio: A provlem occurred manipulating the Web Service XML: " +
                                         meridioDataSetException.getMessage(), meridioDataSetException);
-                                throw new MetacartaException("Meridio: A problem occurred manipulating the Web " +
+                                throw new LCFException("Meridio: A problem occurred manipulating the Web " +
                                         "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
                         }
                 }

Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java Wed Feb 17 15:57:27 2010
@@ -113,7 +113,7 @@
 
 	/** Set up the session with Meridio */
 	protected void getSession()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		if (meridio_ == null)
 		{
@@ -179,8 +179,8 @@
 			}		
 			catch (MalformedURLException malformedURLException)
 			{			
-				throw new MetacartaException("Meridio: Could not construct the URL for either " +
-								 "the DM or RM Meridio Web Service", malformedURLException, MetacartaException.REPOSITORY_CONNECTION_ERROR);
+				throw new LCFException("Meridio: Could not construct the URL for either " +
+								 "the DM or RM Meridio Web Service", malformedURLException, LCFException.REPOSITORY_CONNECTION_ERROR);
 			}
 
 			// Do the second part (where we actually try to connect to the system)
@@ -205,7 +205,7 @@
 			}
 			catch (UnknownHostException unknownHostException)
 			{
-				throw new MetacartaException("Meridio: A Unknown Host Exception occurred while " +
+				throw new LCFException("Meridio: A Unknown Host Exception occurred while " +
 					"connecting - is a network software and hardware configuration: "+unknownHostException.getMessage(), unknownHostException);
 			}
 			catch (org.apache.axis.AxisFault e)
@@ -218,15 +218,15 @@
 					{
 						elem.normalize();
 						String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-						throw new MetacartaException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+						throw new LCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
 					}
-					throw new MetacartaException("Unknown http error occurred while connecting: "+e.getMessage(),e);
+					throw new LCFException("Unknown http error occurred while connecting: "+e.getMessage(),e);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 				{
 					String exceptionName = e.getFaultString();
 					if (exceptionName.equals("java.lang.InterruptedException"))
-						throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 				}
 				if (Logging.connectors.isDebugEnabled())
 					Logging.connectors.debug("Meridio: Got an unknown remote exception connecting - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
@@ -235,7 +235,7 @@
 			}
 			catch (RemoteException remoteException)
 			{			
-				throw new MetacartaException("Meridio: An unknown remote exception occurred while " +
+				throw new LCFException("Meridio: An unknown remote exception occurred while " +
 					"connecting: "+remoteException.getMessage(), remoteException);
 			}
 
@@ -262,7 +262,7 @@
 	*@return the connection's status as a displayable string.
 	*/
 	public String check()
-		throws MetacartaException
+		throws LCFException
 	{
 		Logging.connectors.debug("Meridio: Entering 'check' method");
 
@@ -276,7 +276,7 @@
 		{
 			return "Meridio temporarily unavailable: "+e.getMessage();
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			return e.getMessage();
 		}
@@ -332,7 +332,7 @@
 			{
 				String exceptionName = e.getFaultString();
 				if (exceptionName.equals("java.lang.InterruptedException"))
-					throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 			}
 			if (Logging.connectors.isDebugEnabled())
 				Logging.connectors.debug("Meridio: Got an unknown remote exception checking - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString()+" - retrying",e);
@@ -383,7 +383,7 @@
 	/** Close the connection.  Call this before discarding the repository connector.
 	*/
 	public void disconnect()
-		throws MetacartaException
+		throws LCFException
 	{
 		Logging.connectors.debug("Meridio: Entering 'disconnect' method");
 		
@@ -414,7 +414,7 @@
 			{
 				String exceptionName = e.getFaultString();
 				if (exceptionName.equals("java.lang.InterruptedException"))
-					throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+					throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 			}
 			if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 			{
@@ -472,7 +472,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
 	{				
 		Logging.connectors.debug("Meridio: Entering 'getDocumentIdentifiers' method");
 		
@@ -514,7 +514,7 @@
 	*/
 	public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
 		DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{			
 		Logging.connectors.debug("Meridio: Entering 'getDocumentVersions' method");
 
@@ -737,15 +737,15 @@
 					{
 						elem.normalize();
 						String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-						throw new MetacartaException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+						throw new LCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
 					}
-					throw new MetacartaException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
+					throw new LCFException("Unknown http error occurred while getting doc versions: "+e.getMessage(),e);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 				{
 					String exceptionName = e.getFaultString();
 					if (exceptionName.equals("java.lang.InterruptedException"))
-						throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 				{
@@ -764,12 +764,12 @@
 			}
 			catch (RemoteException remoteException)
 			{
-				throw new MetacartaException("Meridio: A remote exception occurred while getting doc versions: " +
+				throw new LCFException("Meridio: A remote exception occurred while getting doc versions: " +
 					remoteException.getMessage(), remoteException);
 			}
 			catch (MeridioDataSetException meridioDataSetException)
 			{
-				throw new MetacartaException("Meridio: A problem occurred manipulating the Web " +
+				throw new LCFException("Meridio: A problem occurred manipulating the Web " +
 					"Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
 			}
 		}
@@ -789,7 +789,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
 	{
 		Logging.connectors.debug("Meridio: Entering 'processDocuments' method");
 
@@ -1291,15 +1291,15 @@
 					}
 					catch (java.net.SocketTimeoutException ioex)
 					{
-						throw new MetacartaException("Socket timeout exception: "+ioex.getMessage(), ioex);
+						throw new LCFException("Socket timeout exception: "+ioex.getMessage(), ioex);
 					}
 					catch (org.apache.commons.httpclient.ConnectTimeoutException ioex)
 					{
-						throw new MetacartaException("Connect timeout exception: "+ioex.getMessage(), ioex);
+						throw new LCFException("Connect timeout exception: "+ioex.getMessage(), ioex);
 					}
 					catch (InterruptedIOException e)
 					{
-						throw new MetacartaException("Interrupted: "+e.getMessage(),e,MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted: "+e.getMessage(),e,LCFException.INTERRUPTED);
 					}
 					catch (org.apache.axis.AxisFault e)
 					{
@@ -1311,12 +1311,12 @@
 					}
 					catch (SOAPException soapEx)
 					{
-						throw new MetacartaException("SOAP Exception encountered while retrieving document content: "+soapEx.getMessage(), 
+						throw new LCFException("SOAP Exception encountered while retrieving document content: "+soapEx.getMessage(), 
 								soapEx);
 					}
 					catch (IOException ioex)
 					{
-						throw new MetacartaException("Input stream failure: "+ioex.getMessage(), ioex);
+						throw new LCFException("Input stream failure: "+ioex.getMessage(), ioex);
 					}
 					i++;								
 				}
@@ -1334,15 +1334,15 @@
 					{
 						elem.normalize();
 						String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-						throw new MetacartaException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+						throw new LCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
 					}
-					throw new MetacartaException("Unknown http error occurred while processing docs: "+e.getMessage(),e);
+					throw new LCFException("Unknown http error occurred while processing docs: "+e.getMessage(),e);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 				{
 					String exceptionName = e.getFaultString();
 					if (exceptionName.equals("java.lang.InterruptedException"))
-						throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 				{
@@ -1361,12 +1361,12 @@
 			}
 			catch (RemoteException remoteException)
 			{			
-				throw new MetacartaException("Meridio: A remote exception occurred while " +
+				throw new LCFException("Meridio: A remote exception occurred while " +
 					"processing a Meridio document: "+remoteException.getMessage(), remoteException);
 			}
 			catch (MeridioDataSetException meridioDataSetException)
 			{
-				throw new MetacartaException("Meridio: A DataSet exception occurred while  " +
+				throw new LCFException("Meridio: A DataSet exception occurred while  " +
 					"processing a Meridio document", meridioDataSetException);
 			}
 		}
@@ -2159,7 +2159,7 @@
 				long startTime,
 				long endTime
 		)
-		throws MetacartaException,ServiceInterruption
+		throws LCFException,ServiceInterruption
 		{			
 			Logging.connectors.debug("Meridio: Entering 'IdentifierStream' constructor");
 			while (true)
@@ -2189,15 +2189,15 @@
 						{
 							elem.normalize();
 							String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-							throw new MetacartaException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
+							throw new LCFException("Unexpected http error code "+httpErrorCode+" accessing Meridio: "+e.getMessage(),e);
 						}
-						throw new MetacartaException("Unknown http error occurred while performing search: "+e.getMessage(),e);
+						throw new LCFException("Unknown http error occurred while performing search: "+e.getMessage(),e);
 					}
 					if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 					{
 						String exceptionName = e.getFaultString();
 						if (exceptionName.equals("java.lang.InterruptedException"))
-							throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+							throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 					}
 					if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 					{
@@ -2215,12 +2215,12 @@
 				}
 				catch (RemoteException remoteException)
 				{			
-					throw new MetacartaException("Meridio: A Remote Exception occurred while " +
+					throw new LCFException("Meridio: A Remote Exception occurred while " +
 						"performing a search: "+remoteException.getMessage(), remoteException);
 				}
 				catch (MeridioDataSetException meridioDataSetException)
 				{						
-					throw new MetacartaException("Meridio: A problem occurred manipulating the Web " +
+					throw new LCFException("Meridio: A problem occurred manipulating the Web " +
 						"Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
 				}
 			}
@@ -2232,7 +2232,7 @@
 		*@return the next document identifier, or null if there are no more.
 		*/
 		public String getNextIdentifier()
-			throws MetacartaException, ServiceInterruption
+			throws LCFException, ServiceInterruption
 		{		
 			Logging.connectors.debug("Meridio: Entering 'getNextIdentifier' method");
 			
@@ -2268,15 +2268,15 @@
 								{
 									elem.normalize();
 									String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-									throw new MetacartaException("Unexpected http error code "+httpErrorCode+" performing search: "+e.getMessage());
+									throw new LCFException("Unexpected http error code "+httpErrorCode+" performing search: "+e.getMessage());
 								}
-								throw new MetacartaException("Unknown http error occurred while performing search: "+e.getMessage(),e);
+								throw new LCFException("Unknown http error occurred while performing search: "+e.getMessage(),e);
 							}
 							if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 							{
 								String exceptionName = e.getFaultString();
 								if (exceptionName.equals("java.lang.InterruptedException"))
-									throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+									throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 							}
 							if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 							{
@@ -2288,7 +2288,7 @@
 								}
 							}
 
-							throw new MetacartaException("Meridio: Got an unknown remote exception performing search - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+							throw new LCFException("Meridio: Got an unknown remote exception performing search - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
 						}
 						catch (RemoteException remoteException)
 						{						
@@ -2299,7 +2299,7 @@
 						}
 						catch (MeridioDataSetException meridioDataSetException)
 						{						
-							throw new MetacartaException("Meridio: A problem occurred manipulating the Web " +
+							throw new LCFException("Meridio: A problem occurred manipulating the Web " +
 						     "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
 						}
 					}
@@ -2326,7 +2326,7 @@
 		/** Close the stream.
 		*/
 		public void close()
-			throws MetacartaException
+			throws LCFException
 		{
 			Logging.connectors.debug("Meridio: Entering 'IdentifierStream.close' method");
 			
@@ -2352,7 +2352,7 @@
 	*@return Sorted array of strings containing the category names
 	*/
 	public String [] getMeridioCategories ()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		Logging.connectors.debug("Entering 'getMeridioCategories' method");
 		
@@ -2402,15 +2402,15 @@
 					{
 						elem.normalize();
 						String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-						throw new MetacartaException("Unexpected http error code "+httpErrorCode+" getting categories: "+e.getMessage());
+						throw new LCFException("Unexpected http error code "+httpErrorCode+" getting categories: "+e.getMessage());
 					}
-					throw new MetacartaException("Unknown http error occurred while getting categories: "+e.getMessage(),e);
+					throw new LCFException("Unknown http error occurred while getting categories: "+e.getMessage(),e);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 				{
 					String exceptionName = e.getFaultString();
 					if (exceptionName.equals("java.lang.InterruptedException"))
-						throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 				{
@@ -2422,16 +2422,16 @@
 					}
 				}
 
-				throw new MetacartaException("Meridio: Got an unknown remote exception getting categories - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+				throw new LCFException("Meridio: Got an unknown remote exception getting categories - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
 			}
 			catch (RemoteException remoteException)
 			{			
-				throw new MetacartaException("Meridio: A Remote Exception occurred while " +
+				throw new LCFException("Meridio: A Remote Exception occurred while " +
 								     "retrieving the Meridio categories: "+remoteException.getMessage(), remoteException);
 			}
 			catch (MeridioDataSetException meridioDataSetException)
 			{			
-				throw new MetacartaException("Meridio: DataSet Exception occurred retrieving the Meridio categories: "+meridioDataSetException.getMessage(), 
+				throw new LCFException("Meridio: DataSet Exception occurred retrieving the Meridio categories: "+meridioDataSetException.getMessage(), 
 						meridioDataSetException);			
 			}
 		}
@@ -2440,7 +2440,7 @@
 	
 	
 	public String [] getMeridioDocumentProperties ()
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		Logging.connectors.debug("Entering 'getMeridioDocumentProperties' method");
 		
@@ -2511,15 +2511,15 @@
 					{
 						elem.normalize();
 						String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-						throw new MetacartaException("Unexpected http error code "+httpErrorCode+" getting document properties: "+e.getMessage());
+						throw new LCFException("Unexpected http error code "+httpErrorCode+" getting document properties: "+e.getMessage());
 					}
-					throw new MetacartaException("Unknown http error occurred while getting document properties: "+e.getMessage(),e);
+					throw new LCFException("Unknown http error occurred while getting document properties: "+e.getMessage(),e);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 				{
 					String exceptionName = e.getFaultString();
 					if (exceptionName.equals("java.lang.InterruptedException"))
-						throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 				{
@@ -2531,16 +2531,16 @@
 					}
 				}
 
-				throw new MetacartaException("Meridio: Got an unknown remote exception getting document properties - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+				throw new LCFException("Meridio: Got an unknown remote exception getting document properties - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
 			}
 			catch (RemoteException remoteException)
 			{			
-				throw new MetacartaException("Meridio: A Remote Exception occurred while " +
+				throw new LCFException("Meridio: A Remote Exception occurred while " +
 								     "retrieving the Meridio document properties: "+remoteException.getMessage(), remoteException);
 			}
 			catch (MeridioDataSetException meridioDataSetException)
 			{			
-				throw new MetacartaException("Meridio: DataSet Exception occurred retrieving the Meridio document properties: "+meridioDataSetException.getMessage(), 
+				throw new LCFException("Meridio: DataSet Exception occurred retrieving the Meridio document properties: "+meridioDataSetException.getMessage(), 
 						meridioDataSetException);			
 			}
 		}
@@ -2552,7 +2552,7 @@
 	(
 		int classOrFolderId
 	)
-	throws MetacartaException, ServiceInterruption
+	throws LCFException, ServiceInterruption
 	{
 		Logging.connectors.debug("Entering 'getClassOrFolderContents' method");
 		
@@ -2619,15 +2619,15 @@
 					{
 						elem.normalize();
 						String httpErrorCode = elem.getFirstChild().getNodeValue().trim();
-						throw new MetacartaException("Unexpected http error code "+httpErrorCode+" getting class or folder contents: "+e.getMessage());
+						throw new LCFException("Unexpected http error code "+httpErrorCode+" getting class or folder contents: "+e.getMessage());
 					}
-					throw new MetacartaException("Unknown http error occurred while getting class or folder contents: "+e.getMessage(),e);
+					throw new LCFException("Unknown http error occurred while getting class or folder contents: "+e.getMessage(),e);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server.userException")))
 				{
 					String exceptionName = e.getFaultString();
 					if (exceptionName.equals("java.lang.InterruptedException"))
-						throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+						throw new LCFException("Interrupted",LCFException.INTERRUPTED);
 				}
 				if (e.getFaultCode().equals(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/envelope/","Server")))
 				{
@@ -2639,16 +2639,16 @@
 					}
 				}
 
-				throw new MetacartaException("Meridio: Got an unknown remote exception getting class or folder contents - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
+				throw new LCFException("Meridio: Got an unknown remote exception getting class or folder contents - axis fault = "+e.getFaultCode().getLocalPart()+", detail = "+e.getFaultString(),e);
 			}
 			catch (RemoteException remoteException)
 			{			
-				throw new MetacartaException("Meridio: A Remote Exception occurred while " +
+				throw new LCFException("Meridio: A Remote Exception occurred while " +
 								     "retrieving class or folder contents: "+remoteException.getMessage(), remoteException);
 			}
 			catch (MeridioDataSetException meridioDataSetException)
 			{						
-				throw new MetacartaException("Meridio: A problem occurred manipulating the Web " +
+				throw new LCFException("Meridio: A problem occurred manipulating the Web " +
 			     "Service XML: "+meridioDataSetException.getMessage(), meridioDataSetException);
 			}
 		}

Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java Wed Feb 17 15:57:27 2010
@@ -63,7 +63,7 @@
 public class MeridioWrapper
 {
 
-	public static final String CONFIGURATION_PROPERTY = "Metacarta_Configuration";
+	public static final String CONFIGURATION_PROPERTY = "LCF_Configuration";
 
 	// This is the local cache
 	protected long meridioCategoriesTime			= -1L;
@@ -145,7 +145,7 @@
 			Logger log,
 			URL    meridioDmwsUrl,
 			URL    meridioRmwsUrl,
-			URL    meridioMetacartaWSUrl,
+			URL    meridioLCFWSUrl,
 			String dmwsProxyHost,
 			String dmwsProxyPort,
 			String rmwsProxyHost,
@@ -234,11 +234,11 @@
 		/*=================================================================
 		* Get a handle to the MeridioMetaCarta Web Service
 		*================================================================*/
-		if (meridioMetacartaWSUrl != null)
+		if (meridioLCFWSUrl != null)
 		{
 			MetaCartaLocator meridioMCWS = new MetaCartaLocator(engineConfiguration);
 			Service McWsService = null;
-			MetaCartaSoapStub meridioMetaCartaWebService = new MetaCartaSoapStub(meridioMetacartaWSUrl, McWsService);
+			MetaCartaSoapStub meridioMetaCartaWebService = new MetaCartaSoapStub(meridioLCFWSUrl, McWsService);
 								
 			meridioMetaCartaWebService.setPortName(meridioMCWS.getMetaCartaSoapWSDDServiceName());
 			meridioMetaCartaWebService.setUsername(userName);

Modified: incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/connectors/meridio/editspec.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/connectors/meridio/editspec.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/connectors/meridio/editspec.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/connectors/meridio/editspec.jsp Wed Feb 17 15:57:27 2010
@@ -185,7 +185,7 @@
 		<td class="message" colspan="2">Service interruption: <%=org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())%></td>
 <%
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace();
 %>
@@ -397,7 +397,7 @@
 		<td class="message" colspan="2">Service interruption: <%=org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())%></td>
 <%
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace();
 %>
@@ -686,7 +686,7 @@
 		<td class="message" colspan="4">Service interruption: <%=org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())%></td>
 <%
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace();
 %>

Modified: incubator/lcf/trunk/modules/connectors/nulloutput/connector/org/apache/lcf/agents/output/nullconnector/NullConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/nulloutput/connector/org/apache/lcf/agents/output/nullconnector/NullConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/nulloutput/connector/org/apache/lcf/agents/output/nullconnector/NullConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/nulloutput/connector/org/apache/lcf/agents/output/nullconnector/NullConnector.java Wed Feb 17 15:57:27 2010
@@ -75,14 +75,14 @@
         /** Close the connection.  Call this before discarding the connection.
         */
         public void disconnect()
-                throws MetacartaException
+                throws LCFException
         {
                 super.disconnect();
         }
 
         /** Set up a session */
         protected void getSession()
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
         }
         
@@ -90,7 +90,7 @@
         *@return the connection's status as a displayable string.
         */
         public String check()
-                throws MetacartaException
+                throws LCFException
         {
                 try
                 {
@@ -115,7 +115,7 @@
         * the document will not need to be sent again to the output data store.
         */
         public String getOutputDescription(OutputSpecification spec)
-                throws MetacartaException
+                throws LCFException
         {
                 return "";
         }
@@ -135,7 +135,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();
@@ -151,7 +151,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/rss/connector/org/apache/lcf/crawler/connectors/rss/DataCache.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/DataCache.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/DataCache.java (original)
+++ incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/DataCache.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;
 import java.util.*;
 import java.io.*;
 
@@ -50,7 +50,7 @@
 	*@return the checksum value.
 	*/
 	public long addData(IVersionActivity activities, String documentIdentifier, InputStream dataStream)
-		throws MetacartaException, ServiceInterruption
+		throws LCFException, ServiceInterruption
 	{
 		// Create a temporary file; that's what we will cache
 		try
@@ -63,7 +63,7 @@
 				// after it's removed.  So disable this and live with the occasional
 				// dangling file left as a result of shutdown or error. :-(
 				// tempFile.deleteOnExit();
-				Metacarta.addFile(tempFile);
+				LCF.addFile(tempFile);
 
 				// Transfer data to temporary file
 				long checkSum = 0L;
@@ -94,7 +94,7 @@
 						}
 						catch (InterruptedIOException e)
 						{
-							throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+							throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
 						}
 						catch (IOException e)
 						{
@@ -133,35 +133,35 @@
 			}
 			catch (IOException e)
 			{
-				Metacarta.deleteFile(tempFile);
+				LCF.deleteFile(tempFile);
 				throw e;
 			}
 			catch (ServiceInterruption e)
 			{
-				Metacarta.deleteFile(tempFile);
+				LCF.deleteFile(tempFile);
 				throw e;
 			}
 			catch (Error e)
 			{
-				Metacarta.deleteFile(tempFile);
+				LCF.deleteFile(tempFile);
 				throw e;
 			}
 		}
 		catch (java.net.SocketTimeoutException e)
 		{
-			throw new MetacartaException("Socket timeout exception creating temporary file: "+e.getMessage(),e);
+			throw new LCFException("Socket timeout exception creating temporary file: "+e.getMessage(),e);
 		}
 		catch (org.apache.commons.httpclient.ConnectTimeoutException e)
 		{
-			throw new MetacartaException("Socket connect timeout exception creating temporary file: "+e.getMessage(),e);
+			throw new LCFException("Socket connect timeout exception creating temporary file: "+e.getMessage(),e);
 		}
 		catch (InterruptedIOException e)
 		{
-			throw new MetacartaException("Interrupted: "+e.getMessage(),MetacartaException.INTERRUPTED);
+			throw new LCFException("Interrupted: "+e.getMessage(),LCFException.INTERRUPTED);
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception creating temporary file: "+e.getMessage(),e);
+			throw new LCFException("IO exception creating temporary file: "+e.getMessage(),e);
 		}
 	}
 
@@ -170,7 +170,7 @@
 	*@return the length.
 	*/
 	public synchronized long getDataLength(String documentIdentifier)
-		throws MetacartaException
+		throws LCFException
 	{
 		File f = (File)cacheData.get(documentIdentifier);
 		if (f == null)
@@ -183,7 +183,7 @@
 	*@return a binary data stream.
 	*/
 	public synchronized InputStream getData(String documentIdentifier)
-		throws MetacartaException
+		throws LCFException
 	{
 		File f = (File)cacheData.get(documentIdentifier);
 		if (f == null)
@@ -194,7 +194,7 @@
 		}
 		catch (IOException e)
 		{
-			throw new MetacartaException("IO exception getting data length: "+e.getMessage(),e);
+			throw new LCFException("IO exception getting data length: "+e.getMessage(),e);
 		}
 	}
 
@@ -207,7 +207,7 @@
 		cacheData.remove(documentIdentifier);
 		if (f != null)
 		{
-			Metacarta.deleteFile(f);
+			LCF.deleteFile(f);
 		}
 	}
 

Modified: incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/GetSeedList.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/GetSeedList.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/GetSeedList.java (original)
+++ incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/GetSeedList.java Wed Feb 17 15:57:27 2010
@@ -47,7 +47,7 @@
 
 		try
 		{
-		        Metacarta.initializeEnvironment();
+		        LCF.initializeEnvironment();
 			IThreadContext tc = ThreadContextFactory.make();
 			IJobManager jobManager = JobManagerFactory.make(tc);
 			IJobDescription desc = jobManager.load(new Long(jobString));



Mime
View raw message