You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/02/17 16:57:35 UTC

svn commit: r911029 [19/19] - in /incubator/lcf/trunk: modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/ modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/ modules/connectors/documentum/crawle...

Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/MemexSupport.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/MemexSupport.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/MemexSupport.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/MemexSupport.java Wed Feb 17 15:57:27 2010
@@ -45,9 +45,9 @@
         public static final String _rcsid = "@(#)$Id$";
 
         //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
@@ -55,7 +55,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
@@ -77,7 +77,7 @@
         /** Constructor.  Self-explanatory.
         */
         public MemexSupport(String memexUserID, String memexPassword, String memexServerName, String memexServerPort)
-                throws MetacartaException
+                throws LCFException
         {
                 miePool.setUsername(memexUserID);
                 miePool.setPassword(memexPassword);
@@ -92,24 +92,24 @@
         *@return a string identifier that can be used to identify the record uniquely
         */
         public String addRecord(Hashtable keyValuePairs, String server, String database)
-                throws MetacartaException
+                throws LCFException
         {
                 try{
                         this.setupConnection();
                 }catch(Exception e){
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
 
                 //Check the logical server exists
                 LogicalServer ls = logicalServers.get(server);
                 if(ls == null){
-                        throw new MetacartaException("Memex Error adding a record - logical server " + server + " cannot be found");
+                        throw new LCFException("Memex Error adding a record - logical server " + server + " cannot be found");
                 }
 
                 //Check the entity exists
                 MemexEntity ent = entitiesByPrefix.get(database);
                 if(ent == null){
-                        throw new MetacartaException("Memex Error adding a record - entity " + database + " cannot be found");
+                        throw new LCFException("Memex Error adding a record - entity " + database + " cannot be found");
                 }
 
                 //Check there is a database of the selected entity type on the selected server
@@ -123,7 +123,7 @@
                         }
                 }
                 if(found == false){
-                        throw new MetacartaException("Memex Error adding a record - entity " + database + " not found on server " + server);
+                        throw new LCFException("Memex Error adding a record - entity " + database + " not found on server " + server);
                 }
 
                 //Build up the minimum fields for a Memex record
@@ -136,10 +136,10 @@
                                 sysurn = prefix + "0" + sysurn.substring(4);
                         }
                 }catch(MemexException e){
-                        throw new MetacartaException("Memex Error adding record - " + e.getMessage(),e);
+                        throw new LCFException("Memex Error adding record - " + e.getMessage(),e);
                 }
                 if(sysurn.equals("")){
-                        throw new MetacartaException("Memex Error adding record - failed to get a urn");
+                        throw new LCFException("Memex Error adding record - failed to get a urn");
                 }
 
                 long epochtime = System.currentTimeMillis();
@@ -236,7 +236,7 @@
                         auditRecord += "xxcreatetime\n" + systimecreated +"\n";
                         auditRecord += "xxcreatedby\n" + miePool.getUsername() +"\n";
                         auditRecord += "xxsessionid\n";
-                        auditRecord += "xxfullname\nMetacarta Support Program\n";
+                        auditRecord += "xxfullname\nLCF Support Program\n";
                         auditRecord += "xxusername\n" + miePool.getUsername() +"\n";
                         auditRecord += "xxclienthost\n" + InetAddress.getLocalHost().getHostName() +"\n";
 
@@ -253,7 +253,7 @@
                         cs.getMIE().mie.mxie_svrfile_remove(appendFile);
 
                 }catch(Exception e){
-                        throw new MetacartaException("Memex Error adding record : " + e.getMessage(),e);
+                        throw new LCFException("Memex Error adding record : " + e.getMessage(),e);
                 }
 
                 return sysurn;
@@ -265,24 +265,24 @@
         *@param keyValuePairs is the set of fieldname/value pairs to change
         */
         public void modifyRecord(String id, Hashtable keyValuePairs)
-                throws MetacartaException
+                throws LCFException
         {
                 try{
                         this.setupConnection();
                 }catch(Exception e){
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
 
                 //Check the logical server exists
                 LogicalServer ls = logicalServersByPrefix.get(id.substring(0, 2));
                 if(ls == null){
-                    throw new MetacartaException("Memex Error modifying a record - logical server cannot be found");
+                    throw new LCFException("Memex Error modifying a record - logical server cannot be found");
                 }
 
                 //Check the entity exists
                 MemexEntity ent = entitiesByPrefix.get(id.substring(2, 4));
                 if(ent == null){
-                    throw new MetacartaException("Memex Error modifying a record - entity cannot be found");
+                    throw new LCFException("Memex Error modifying a record - entity cannot be found");
                 }
 
                 //Check there is a database of the selected entity type on the selected server
@@ -296,7 +296,7 @@
                     }
                 }
                 if(found == false){
-                    throw new MetacartaException("Memex Error modifying a record - entity not found on server ");
+                    throw new LCFException("Memex Error modifying a record - entity not found on server ");
                 }
 
                 //OK - do the search
@@ -345,7 +345,7 @@
                                 String sysurn = (String)mxRecord.get("sysurn");
                                 if((sysurn == null)||(!(sysurn.equals(id)))){
                                         //something's gone way wrong
-                                        throw new MetacartaException("Memex Error : returned record does not match provided ID when updating record");
+                                        throw new LCFException("Memex Error : returned record does not match provided ID when updating record");
                                 }else{
                                         mxRecord.remove("sysurn");
                                         sysurn += "\n";
@@ -484,7 +484,7 @@
                                 auditRecord += "xxreviewdate\n\n";
                                 auditRecord += "xxcreatedby\n" + miePool.getUsername() +"\n";
                                 auditRecord += "xxsessionid\n";
-                                auditRecord += "xxfullname\nMetacarta Support Program\n";
+                                auditRecord += "xxfullname\nLCF Support Program\n";
                                 auditRecord += "xxusername\n" + miePool.getUsername() +"\n";
                                 auditRecord += "xxclienthost\n" + InetAddress.getLocalHost().getHostName() +"\n";
 
@@ -502,7 +502,7 @@
 
                     }
                 }catch(Exception e){
-                    throw new MetacartaException("Memex Error searching for record to modify : " + e.getMessage(),e);
+                    throw new LCFException("Memex Error searching for record to modify : " + e.getMessage(),e);
                 }
 
 
@@ -514,7 +514,7 @@
         *@param id is a string identifier which uniquely identifies the record to remove
         */
         public void removeRecord(String id)
-                throws MetacartaException
+                throws LCFException
         {
                 try{
                         this.setupConnection();
@@ -522,13 +522,13 @@
                        //Check the logical server exists
                         LogicalServer ls = logicalServersByPrefix.get(id.substring(0, 2));
                         if(ls == null){
-                                    throw new MetacartaException("Memex Error deleting a record - logical server cannot be found");
+                                    throw new LCFException("Memex Error deleting a record - logical server cannot be found");
                         }
 
                         //Check the entity exists
                         MemexEntity ent = entitiesByPrefix.get(id.substring(2, 4));
                         if(ent == null){
-                                    throw new MetacartaException("Memex Error deleting a record - entity cannot be found");
+                                    throw new LCFException("Memex Error deleting a record - entity cannot be found");
                         }
 
                         //Check there is a database of the selected entity type on the selected server
@@ -542,7 +542,7 @@
                                     }
                         }
                         if(found == false){
-                                    throw new MetacartaException("Memex Error deleting a record - entity not found on server ");
+                                    throw new LCFException("Memex Error deleting a record - entity not found on server ");
                         }
 
 
@@ -563,7 +563,7 @@
                         auditRecord += "xxcreatetime\n" + timedeleted +"\n";
                         auditRecord += "xxcreatedby\n" + miePool.getUsername() +"\n";
                         auditRecord += "xxsessionid\n";
-                        auditRecord += "xxfullname\nMetacarta Support Program\n";
+                        auditRecord += "xxfullname\nLCF Support Program\n";
                         auditRecord += "xxusername\n" + miePool.getUsername() +"\n";
                         auditRecord += "xxclienthost\n" + InetAddress.getLocalHost().getHostName() +"\n";
 
@@ -581,7 +581,7 @@
 
 
                 }catch(Exception e){
-                    throw new MetacartaException(e.getMessage(),e);
+                    throw new LCFException(e.getMessage(),e);
                 }
         }
         
@@ -595,7 +595,7 @@
         *@return the id of the first record that matches, or null if none found
         */
         public String lookupRecord(String virtualServer, String entityName, String fieldName, String fieldValue)
-                throws MetacartaException
+                throws LCFException
         {
 
                 try{
@@ -604,13 +604,13 @@
                    //Check the logical server exists
                     LogicalServer ls = logicalServers.get(virtualServer);
                     if(ls == null){
-                                throw new MetacartaException("Memex Error looking up a record - logical server cannot be found");
+                                throw new LCFException("Memex Error looking up a record - logical server cannot be found");
                     }
 
                     //Check the entity exists
                     MemexEntity ent = entitiesByPrefix.get(entityName);
                     if(ent == null){
-                                throw new MetacartaException("Memex Error looking up a record - entity cannot be found");
+                                throw new LCFException("Memex Error looking up a record - entity cannot be found");
                     }
 
                     //Check the entity contains the field we're looking for
@@ -622,7 +622,7 @@
                                 }
                     }
                     if(!found){
-                                throw new MetacartaException("Memex Error looking up a record - entity does not contain field");
+                                throw new LCFException("Memex Error looking up a record - entity does not contain field");
                     }
 
                     //Check there is a database of the selected entity type on the selected server
@@ -636,7 +636,7 @@
                                 }
                     }
                     if(found == false){
-                                throw new MetacartaException("Memex Error looking up a record - entity not found on server ");
+                                throw new LCFException("Memex Error looking up a record - entity not found on server ");
                     }
 
                     //strip off the subrecord name
@@ -653,7 +653,7 @@
                                 return sysurn.getText();
                     }
                 }catch(Exception e){
-                    throw new MetacartaException(e.getMessage(),e);
+                    throw new LCFException(e.getMessage(),e);
                 }
                 return null;
         }
@@ -666,7 +666,7 @@
         *@param userGroupSet is the set of security group identifiers that have read access (?)
         */
         public void setRecordSecurity(String id, String[] userGroupSet)
-                throws MetacartaException
+                throws LCFException
         {
                 
                 try{
@@ -677,7 +677,7 @@
                         for(int i = 0; i < userGroupSet.length; i++){
                                 String lock = getSecurityLock(userGroupSet[i]);
                                 if (lock == null)
-                                        throw new MetacartaException("Invalid user/group name: '"+userGroupSet[i]+"'");
+                                        throw new LCFException("Invalid user/group name: '"+userGroupSet[i]+"'");
                                 if(i > 0){
                                         clocks += ", " + lock;
                                 }else{
@@ -691,11 +691,11 @@
                                 this.modifyRecord(id, newValues);
                         }
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         throw e;
                 }catch(Exception e){
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
 
         }
@@ -710,7 +710,7 @@
         *@param protectedmessage is the nessage isplayed to users who do not have access to the record.
         */
         public void setRecordSecurity(String id, String[] userGroupSet, String protectedmessage)
-                throws MetacartaException
+                throws LCFException
         {
                 try{
                         this.setupConnection();
@@ -720,7 +720,7 @@
                         for(int i = 0; i < userGroupSet.length; i++){
                                 String lock = getSecurityLock(userGroupSet[i]);
                                 if (lock == null)
-                                        throw new MetacartaException("Invalid user/group name: '"+userGroupSet[i]+"'");
+                                        throw new LCFException("Invalid user/group name: '"+userGroupSet[i]+"'");
                                 if(i > 0){
                                         plocks += ", " + lock;
                                 }else{
@@ -738,12 +738,12 @@
                                 this.modifyRecord(id, newValues);
                         }
                 }
-                catch (MetacartaException e)
+                catch (LCFException e)
                 {
                         throw e;
                 }
                 catch(Exception e){
-                        throw new MetacartaException(e.getMessage(),e);
+                        throw new LCFException(e.getMessage(),e);
                 }
 
         }
@@ -751,7 +751,7 @@
         /** Close the connection.  Call this before discarding the repository connector.
         */
         public void close()
-                throws MetacartaException
+                throws LCFException
         {
                 this.cleanUpConnections();
         }
@@ -762,7 +762,7 @@
         /*********************************************************************************/
 
         private void setupConnection()
-                throws MetacartaException, ServiceInterruption
+                throws LCFException, ServiceInterruption
         {
                 boolean connected = false;
                 if((this.physicalServers != null) && !(this.physicalServers.isEmpty())){
@@ -770,7 +770,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;
                                 }
@@ -784,10 +784,10 @@
                 if(!connected){
                     try{
                                 //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>();
@@ -807,7 +807,7 @@
                                 mieConnection.ConnectionMessage = "Connection to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " created";
 
                                 //Initialise the Query History
-                                //mieConnection.mie.mxie_history_open("MetacartaSupport", 1000);
+                                //mieConnection.mie.mxie_history_open("LCFSupport", 1000);
 
 
                                 //Create a collection of data structures describing the entities in this set-up
@@ -819,7 +819,7 @@
 
                     }
                     catch(PoolAuthenticationException e){
-                                throw new MetacartaException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()),e);
+                                throw new LCFException("Authentication failure connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()),e);
                     }
                     catch(PoolException e){
                         //Logging.connectors.warn("Memex: Pool error connecting to Memex Server " + miePool.getHostname() + ":" + Integer.toString(miePool.getPort()) + " - " + e.getMessage() + " - retrying: " + e.getMessage(),e);
@@ -853,7 +853,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);
@@ -884,7 +884,7 @@
         /**Creates an alphabetically ordered list of entity objects.
         */
         private void getEntities()
-                throws MemexException, MetacartaException
+                throws MemexException, LCFException
         {
                 String mxEntityPath = null;
                 String[] entityReturn = new String[1];
@@ -955,12 +955,12 @@
                                             // 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(IOException e){
                                             // I/O problem
-                                            throw new MetacartaException(e.getMessage(),e);
+                                            throw new LCFException(e.getMessage(),e);
                                         }
                                         finally
                                         {
@@ -970,7 +970,7 @@
                                             }
                                             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){
@@ -1104,7 +1104,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{
@@ -1120,21 +1120,21 @@
                                                 logicalServers.put(ls.getServerName(), ls);
                                                 logicalServersByPrefix.put(ls.getPrefix(), ls);
                                                 //Initialise the Query History
-                                                //ls.getMIE().mie.mxie_history_open("MetacartaSupport", 1000);
+                                                //ls.getMIE().mie.mxie_history_open("LCFSupport", 1000);
                                         }
                                 }
                     }
                 }
         }
 
-        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;
@@ -1243,7 +1243,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{

Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/ModifyRecord.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/ModifyRecord.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/ModifyRecord.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/ModifyRecord.java Wed Feb 17 15:57:27 2010
@@ -52,7 +52,7 @@
 			}
 			System.err.println("Successfully modified");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/RemoveRecord.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/RemoveRecord.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/RemoveRecord.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/RemoveRecord.java Wed Feb 17 15:57:27 2010
@@ -51,7 +51,7 @@
 			}
 			System.err.println("Successfully removed");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/SetRecordSecurity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/SetRecordSecurity.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/SetRecordSecurity.java (original)
+++ incubator/lcf/trunk/tests/memex-testing-package/org/apache/lcf/crawler/connectors/memex/SetRecordSecurity.java Wed Feb 17 15:57:27 2010
@@ -62,7 +62,7 @@
 			}
 			System.err.println("Successfully set security");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddDocMultiple.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddDocMultiple.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddDocMultiple.java (original)
+++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddDocMultiple.java Wed Feb 17 15:57:27 2010
@@ -44,7 +44,7 @@
 		if (args.length < 9 || args.length > 10)
 		{
 			System.err.println("Usage: AddDocMultiple <docurl> <recurl> <username> <password> <folder> <filebasepath> <titlebasename> <levels> <docsperlevel> [<category>]");
-			System.err.println(" E.g.: AddDocMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 MetacartaSearchable");
+			System.err.println(" E.g.: AddDocMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 LCFSearchable");
 			System.exit(1);
 		}
 

Modified: incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddRecMultiple.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddRecMultiple.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddRecMultiple.java (original)
+++ incubator/lcf/trunk/tests/meridio-testing-package/org/apache/lcf/crawler/connectors/meridio/AddRecMultiple.java Wed Feb 17 15:57:27 2010
@@ -44,7 +44,7 @@
 		if (args.length < 9 || args.length > 10)
 		{
 			System.err.println("Usage: AddRecMultiple <docurl> <recurl> <username> <password> <folder> <filebasepath> <titlebasename> <levels> <docsperlevel> [<category>]");
-			System.err.println(" E.g.: AddRecMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 MetacartaSearchable");
+			System.err.println(" E.g.: AddRecMultiple ... ... ... ... /LargeDocs /root/largefiles lf 3 10 LCFSearchable");
 			System.exit(1);
 		}
 

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddDoc.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddDoc.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddDoc.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
 			}
 			System.err.println("Successfully added");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToLibrary.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToLibrary.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToLibrary.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToLibrary.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
 			}
 			System.err.println("Successfully added user");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToSite.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToSite.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToSite.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/AddUserToSite.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
 			}
 			System.err.println("Successfully added user to site");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/FPSEPublish.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/FPSEPublish.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/FPSEPublish.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/FPSEPublish.java Wed Feb 17 15:57:27 2010
@@ -67,7 +67,7 @@
 
 	public FPSEPublish(String serverProtocol, String serverName, int serverPort, String serverLocation,
 		String userName, String password, String domainName)
-		throws MetacartaException
+		throws LCFException
 	{
 		this.serverProtocol = serverProtocol;
 		this.serverName = serverName;
@@ -82,7 +82,7 @@
 	}
 
 	public void close()
-		throws MetacartaException
+		throws LCFException
 	{
 	}
 
@@ -103,7 +103,7 @@
 	}
 
 	protected void UrlToWebUrl(String uri)
-		throws MetacartaException
+		throws LCFException
 	{
 		String actualURL = getBaseUrl() + "/" + uri;
 		try
@@ -117,20 +117,20 @@
 
 			webUrl = GetReturnValue(response, "webUrl").replaceAll(" ","%20");
 			if (webUrl == null)
-				throw new MetacartaException("Null web url for document described by '"+uri+"'");
+				throw new LCFException("Null web url for document described by '"+uri+"'");
 			fileUrl = GetReturnValue(response, "fileUrl");
 			if (fileUrl == null)
-				throw new MetacartaException("Null file url for document described by '"+uri+"'");
+				throw new LCFException("Null file url for document described by '"+uri+"'");
 			// System.out.println("File url = "+fileUrl);
 		}
 		catch (MalformedURLException e)
 		{
-			throw new MetacartaException("Malformed URL: '"+actualURL+"'",e);
+			throw new LCFException("Malformed URL: '"+actualURL+"'",e);
 		}
 	}
 
 	public void removeDocument(String url)
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -152,16 +152,16 @@
 	    }
 	    catch (UnsupportedEncodingException e)
 	    {
-		throw new MetacartaException("Unsupported encoding",e);
+		throw new LCFException("Unsupported encoding",e);
 	    }
 	    catch (IOException e)
 	    {
-		throw new MetacartaException("IO exception",e);
+		throw new LCFException("IO exception",e);
 	    }
 	}
 
 	public void writeDocument(String url, String fileName, String metaInfo)
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -215,20 +215,20 @@
 	    }
 	    catch (FileNotFoundException e)
 	    {
-		throw new MetacartaException("File not found",e);
+		throw new LCFException("File not found",e);
 	    }
 	    catch (UnsupportedEncodingException e)
 	    {
-		throw new MetacartaException("Unsupported encoding",e);
+		throw new LCFException("Unsupported encoding",e);
 	    }
 	    catch (IOException e)
 	    {
-		throw new MetacartaException("IO exception",e);
+		throw new LCFException("IO exception",e);
 	    }
 	}
 
 	public void checkinDocument(String uri)
-		throws MetacartaException
+		throws LCFException
 	{
 		UrlToWebUrl(uri);
 
@@ -241,13 +241,13 @@
 		}
 		catch (UnsupportedEncodingException e)
 		{
-			throw new MetacartaException("Unsupported encoding",e);
+			throw new LCFException("Unsupported encoding",e);
 		}
 
 	}
 
     	public void addUser( String siteUrl, String lib, String user)
-		throws MetacartaException
+		throws LCFException
     	{
 		try
 		{
@@ -258,16 +258,16 @@
 		}
 		catch (org.apache.axis.AxisFault e)
 		{
-			throw new MetacartaException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
+			throw new LCFException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
 		}
 		catch (Exception e)
 		{
-			throw new MetacartaException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'",e);
+			throw new LCFException("Error adding user '"+user+"' to '"+siteUrl+"' library '"+lib+"'",e);
 		}
     	}
     
     	public void delUser( String siteUrl, String lib, String user)
-		throws MetacartaException
+		throws LCFException
     	{
 		try
 		{
@@ -278,16 +278,16 @@
 		}
 		catch (org.apache.axis.AxisFault e)
 		{
-			throw new MetacartaException("Error removing user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
+			throw new LCFException("Error removing user '"+user+"' to '"+siteUrl+"' library '"+lib+"'; axis fault: "+e.dumpToString(),e);
 		}
 		catch (Exception e)
 		{
-			throw new MetacartaException("Error removing user '"+user+"' from '"+siteUrl+"' library '"+lib+"'",e);
+			throw new LCFException("Error removing user '"+user+"' from '"+siteUrl+"' library '"+lib+"'",e);
 		}
     	}
 
 	public void addSiteUser( String siteUrl, String alias, String displayName, String email, String group)
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -306,18 +306,18 @@
 				}
 				catch (org.apache.axis.AxisFault e)
 				{
-					throw new MetacartaException("Error adding site user '"+alias+"' to site '"+siteUrl+"' in group '" + group + "'; axis fault: "+e.dumpToString(),e);
+					throw new LCFException("Error adding site user '"+alias+"' to site '"+siteUrl+"' in group '" + group + "'; axis fault: "+e.dumpToString(),e);
 				}
 			}
 		}
 		catch (Exception e)
 		{
-			throw new MetacartaException("Error adding site user '"+alias+"' to '"+siteUrl,e);
+			throw new LCFException("Error adding site user '"+alias+"' to '"+siteUrl,e);
 		}
         }
     
 	public void delSiteUser( String siteUrl, String alias )
-		throws MetacartaException
+		throws LCFException
 	{
 		try
 		{
@@ -328,17 +328,17 @@
 		}
 		catch (org.apache.axis.AxisFault e)
 		{
-			throw new MetacartaException("Error removing site user '"+alias+"' from '"+siteUrl+"'; axis fault: "+e.dumpToString(),e);
+			throw new LCFException("Error removing site user '"+alias+"' from '"+siteUrl+"'; axis fault: "+e.dumpToString(),e);
 		}
 		catch (Exception e)
 		{
-			throw new MetacartaException("Error removing site user '"+alias+"' from '"+siteUrl+"'",e);
+			throw new LCFException("Error removing site user '"+alias+"' from '"+siteUrl+"'",e);
 		}
 
     	}
 
 	public void setDocsMetaInfo(String uri, String metaInfo)
-		throws MetacartaException
+		throws LCFException
 	{
 	    try
 	    {
@@ -351,12 +351,12 @@
 	    }
 	    catch (UnsupportedEncodingException e)
 	    {
-		throw new MetacartaException("Unsupported encoding",e);
+		throw new LCFException("Unsupported encoding",e);
 	    }
 	}
 
 	private String SendRequest(String uri, String postBody)
-		throws MetacartaException
+		throws LCFException
 	{
 
 		try
@@ -380,7 +380,7 @@
 		}
 		catch (Exception e)
 		{
-			throw new MetacartaException("Error sending request to '"+uri+"'",e);
+			throw new LCFException("Error sending request to '"+uri+"'",e);
 		}
 
 	}

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveDoc.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveDoc.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveDoc.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveDoc.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
 			}
 			System.err.println("Successfully deleted");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromLibrary.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
 			}
 			System.err.println("Successfully removed user");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);

Modified: incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromSite.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromSite.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromSite.java (original)
+++ incubator/lcf/trunk/tests/sharepoint-testing-package/org/apache/lcf/crawler/connectors/sharepoint/RemoveUserFromSite.java Wed Feb 17 15:57:27 2010
@@ -50,7 +50,7 @@
 			}
 			System.err.println("Successfully removed site user");
 		}
-		catch (MetacartaException e)
+		catch (LCFException e)
 		{
 			e.printStackTrace(System.err);
 			System.exit(2);