Index: src/edu/ucsb/nceas/metacat/Eml210SAXHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/Eml210SAXHandler.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/Eml210SAXHandler.java	(revision 4698)
@@ -48,7 +48,7 @@
 import org.xml.sax.SAXException;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
 /**
@@ -354,7 +354,7 @@
 				// initialize namespace hash for in line data
 				inlineDataNameSpace = new Hashtable<String, String>();
 				// initialize file writer
-				String docidWithoutRev = MetaCatUtil.getDocIdFromString(docid);
+				String docidWithoutRev = MetacatUtil.getDocIdFromString(docid);
 				String seperator = ".";
 				try {
 					seperator = PropertyService.getProperty("document.accNumSeparator");
@@ -397,7 +397,7 @@
 						&& (processAdditionalAccess || processOtherAccess || processTopLevelAccess)) {
 					// stored the pull out nodes into storedNode stack
 					NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT", null,
-							null, MetaCatUtil.normalize(textBuffer.toString()));
+							null, MetacatUtil.normalize(textBuffer.toString()));
 					storedAccessNodeStack.push(nodeElement);
 
 				}
@@ -639,13 +639,13 @@
 					&& (processAdditionalAccess || processOtherAccess || processTopLevelAccess)) {
 				// stored the pull out nodes into storedNode stack
 				NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "ELEMENT", localName,
-						prefix, MetaCatUtil.normalize(null));
+						prefix, MetacatUtil.normalize(null));
 				storedAccessNodeStack.push(nodeElement);
 				for (int i = 0; i < atts.getLength(); i++) {
 					String attributeName = atts.getQName(i);
 					String attributeValue = atts.getValue(i);
 					NodeRecord nodeAttribute = new NodeRecord(-2, -2, -2, "ATTRIBUTE",
-							attributeName, null, MetaCatUtil.normalize(attributeValue));
+							attributeName, null, MetacatUtil.normalize(attributeValue));
 					storedAccessNodeStack.push(nodeAttribute);
 				}
 
@@ -966,10 +966,10 @@
 						data = (textBuffer.toString()).trim();
 						handleOnlineUrlDataFile(data);
 						/*
-						 * if (data != null && (data.indexOf(MetaCatUtil
+						 * if (data != null && (data.indexOf(MetacatUtil
 						 * .getProperty("httpserver")) != -1 || data
-						 * .indexOf(MetaCatUtil .getProperty("server")) != -1)) { //
-						 * Get docid from url String dataId = MetaCatUtil
+						 * .indexOf(MetacatUtil .getProperty("server")) != -1)) { //
+						 * Get docid from url String dataId = MetacatUtil
 						 * .getDocIdWithRevFromOnlineURL(data); // add to vector
 						 * onlineDataFileIdVector.add(dataId); }//if
 						 */
@@ -1000,7 +1000,7 @@
 						&& (processAdditionalAccess || processOtherAccess || processTopLevelAccess)) {
 					// stored the pull out nodes into storedNode stack
 					NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT", null,
-							null, MetaCatUtil.normalize(textBuffer.toString()));
+							null, MetacatUtil.normalize(textBuffer.toString()));
 					storedAccessNodeStack.push(nodeElement);
 
 				}
@@ -1188,7 +1188,7 @@
 						&& (processAdditionalAccess || processOtherAccess || processTopLevelAccess)) {
 					// stored the pull out nodes into storedNode stack
 					NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "COMMENT", null,
-							null, MetaCatUtil.normalize(str));
+							null, MetacatUtil.normalize(str));
 					storedAccessNodeStack.push(nodeElement);
 
 				}
@@ -1312,7 +1312,7 @@
 						&& (processAdditionalAccess || processOtherAccess || processTopLevelAccess)) {
 					// stored the pull out nodes into storedNode stack
 					NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT", null,
-							null, MetaCatUtil.normalize(data));
+							null, MetacatUtil.normalize(data));
 					storedAccessNodeStack.push(nodeElement);
 
 				}
@@ -1430,7 +1430,7 @@
 							Stack<NodeRecord> newStack = accessObj
 									.getStoredTmpNodeStack();
 							// revise order
-							newStack = MetaCatUtil.reviseStack(newStack);
+							newStack = MetacatUtil.reviseStack(newStack);
 							// go throught the vector of
 							// unChangeableAccessSubtreevector
 							// and find the one whose id is as same as
@@ -1794,7 +1794,7 @@
 			throw new SAXException("The access object is null");
 		}
 		// get rid of rev from dataId
-		// dataId = MetaCatUtil.getDocIdFromString(dataId);
+		// dataId = MetacatUtil.getDocIdFromString(dataId);
 		String permOrder = accessSection.getPermissionOrder();
 		String sql = null;
 		PreparedStatement pstmt = null;
@@ -2171,7 +2171,7 @@
 		}
 
 		// if the url is not in ecogrid protocol, null will be returned
-		String accessionNumber = MetaCatUtil.getAccessionNumberFromEcogridIdentifier(url);
+		String accessionNumber = MetacatUtil.getAccessionNumberFromEcogridIdentifier(url);
 		if (accessionNumber == null) {
 			// the accession number is null if the url does not references a
 			// local data file (url would start with "ecogrid://"
@@ -2180,7 +2180,7 @@
 		} else {
 			// handle ecogrid protocol
 			// get rid of revision number to get the docid.
-			String docid = MetaCatUtil.getDocIdFromAccessionNumber(accessionNumber);
+			String docid = MetacatUtil.getDocIdFromAccessionNumber(accessionNumber);
 
 			currentDistributionSection
 					.setDistributionType(DistributionSection.DATA_DISTRIBUTION);
Index: src/edu/ucsb/nceas/metacat/RemoteDocument.java
===================================================================
--- src/edu/ucsb/nceas/metacat/RemoteDocument.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/RemoteDocument.java	(revision 4698)
@@ -27,7 +27,7 @@
 package edu.ucsb.nceas.metacat;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.HttpMessage;
 import javax.servlet.ServletOutputStream;
 
@@ -215,7 +215,7 @@
     
     // If replication doc home server is local host. throws a exception
     if (replicationDocHomeServer.
-                           equals(MetaCatUtil.getLocalReplicationServerName()))
+                           equals(MetacatUtil.getLocalReplicationServerName()))
     {
       throw new Exception ("Couldn't find the docid: "
                                           +docIdWithoutRevision+"."+revision);
Index: lib/index.jsp
===================================================================
--- lib/index.jsp	(revision 4697)
+++ lib/index.jsp	(revision 4698)
@@ -1,4 +1,4 @@
-<%@ page    language="java" import="edu.ucsb.nceas.metacat.util.MetaCatUtil" %>
+<%@ page    language="java" import="edu.ucsb.nceas.metacat.util.MetacatUtil" %>
 <%
 	/**
  *  '$RCSfile$'
@@ -45,7 +45,7 @@
 String addedParams = "";
 String redirectURI = "";
 
-if (MetaCatUtil.isMetacatConfigured()) {
+if (MetacatUtil.isMetacatConfigured()) {
     //if qformat has not been set, set its value to "DEFAULT_STYLE"
     if (qformat==null) {
       qformat = DEFAULT_STYLE;
Index: lib/style/skins/esa/ESAHeader.jsp
===================================================================
--- lib/style/skins/esa/ESAHeader.jsp	(revision 4697)
+++ lib/style/skins/esa/ESAHeader.jsp	(revision 4698)
@@ -1,6 +1,6 @@
 <%@page contentType="text/html"%>
 <%@page pageEncoding="UTF-8"%>
-<%@page import="edu.ucsb.nceas.metacat.util.MetaCatUtil"%>
+<%@page import="edu.ucsb.nceas.metacat.util.MetacatUtil"%>
 <%@ include file="../../common/common-settings.jsp"%>
 <%@ include file="../../common/configure-check.jsp"%>
 
Index: lib/style/common/configure-check.jsp
===================================================================
--- lib/style/common/configure-check.jsp	(revision 4697)
+++ lib/style/common/configure-check.jsp	(revision 4698)
@@ -1,5 +1,5 @@
 <%@ page errorPage="jsperrorpage.html"%>
-<%@page import="edu.ucsb.nceas.metacat.util.MetaCatUtil"%>
+<%@page import="edu.ucsb.nceas.metacat.util.MetacatUtil"%>
 <%
 	 /**
 	 *   '$RCSfile$'
@@ -27,7 +27,7 @@
 %>
 
 <%
-if (!MetaCatUtil.isMetacatConfigured()) {
+if (!MetacatUtil.isMetacatConfigured()) {
 %>
 	<jsp:forward page="/metacat" />
 <%
Index: src/edu/ucsb/nceas/metacat/QuerySpecification.java
===================================================================
--- src/edu/ucsb/nceas/metacat/QuerySpecification.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/QuerySpecification.java	(revision 4698)
@@ -36,7 +36,7 @@
 import java.util.Stack;
 import java.util.Vector;
 
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 import org.apache.log4j.Logger;
 import org.xml.sax.Attributes;
@@ -629,7 +629,7 @@
               queryTitle = textBuffer.toString().trim();
         } else if (leaving.getTagName().equals("value")) {
               currentValue = textBuffer.toString().trim();
-              currentValue = MetaCatUtil.normalize(currentValue);
+              currentValue = MetacatUtil.normalize(currentValue);
         } else if (leaving.getTagName().equals("pathexpr")) {
               currentPathexpr = textBuffer.toString().trim();
         } else if (leaving.getTagName().equals("returndoctype")) {
@@ -645,7 +645,7 @@
         }
         String normalizedXML = textBuffer.toString().trim();
         logMetacat.debug("================before normailze "+normalizedXML);
-        normalizedXML =  MetaCatUtil.normalize(normalizedXML);
+        normalizedXML =  MetacatUtil.normalize(normalizedXML);
         logMetacat.debug("================after normailze "+normalizedXML);
         xml.append(normalizedXML);
         xml.append("</");
@@ -985,7 +985,7 @@
         	{
         		elementVector.add(path);
         	}       	
-            if(!MetaCatUtil.pathsForIndexing.contains(path)){
+            if(!MetacatUtil.pathsForIndexing.contains(path)){
                 usePathIndex = false;              
             }
          
Index: src/edu/ucsb/nceas/metacat/MetacatReplication.java
===================================================================
--- src/edu/ucsb/nceas/metacat/MetacatReplication.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/MetacatReplication.java	(revision 4698)
@@ -40,7 +40,7 @@
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.service.SessionService;
 import edu.ucsb.nceas.metacat.util.AuthUtil;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.metacat.util.SessionData;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 import edu.ucsb.nceas.utilities.FileUtil;
@@ -626,13 +626,13 @@
       logMetacat.info("Force replication action: "+dbaction);
       // sending back read request to remote server
       URL u = new URL("https://" + server + "?server="
-                +MetaCatUtil.getLocalReplicationServerName()
+                +MetacatUtil.getLocalReplicationServerName()
                 +"&action=read&docid=" + docid);
       String xmldoc = MetacatReplication.getURLContent(u);
 
       // get the document info from server
       URL docinfourl = new URL("https://" + server +
-                               "?server="+MetaCatUtil.getLocalReplicationServerName()
+                               "?server="+MetacatUtil.getLocalReplicationServerName()
                                +"&action=getdocumentinfo&docid=" + docid);
 
       String docInfoStr = MetacatReplication.getURLContent(docinfourl);
@@ -793,8 +793,8 @@
     try
     {
       //docid was switch to two parts uinque code and rev
-      //String uniqueCode=MetaCatUtil.getDocIdFromString(docid);
-      //int rev=MetaCatUtil.getVersionFromString(docid);
+      //String uniqueCode=MetacatUtil.getDocIdFromString(docid);
+      //int rev=MetacatUtil.getVersionFromString(docid);
       if(params.containsKey("dbaction"))
       {
         dbaction = ((String[])params.get("dbaction"))[0];
@@ -810,7 +810,7 @@
       logMetacat.info("Force replication action: "+dbaction);
       // get the document info from server
       URL docinfourl = new URL("https://" + server +
-                               "?server="+MetaCatUtil.getLocalReplicationServerName()
+                               "?server="+MetacatUtil.getLocalReplicationServerName()
                                +"&action=getdocumentinfo&docid=" + docid);
 
       String docInfoStr = MetacatReplication.getURLContent(docinfourl);
@@ -849,7 +849,7 @@
         //Get data file and store it into local file system.
         // sending back readdata request to server
         URL url = new URL("https://" + server + "?server="
-                +MetaCatUtil.getLocalReplicationServerName()
+                +MetacatUtil.getLocalReplicationServerName()
                 +"&action=readdata&docid=" + docid);
         String datafilePath = PropertyService.getProperty("application.datafilepath");
         
@@ -1041,7 +1041,7 @@
       filepath = PropertyService.getProperty("application.datafilepath");
       String server = params.get("server")[0];
       URL u = new URL("https://" + server + "?server="
-                +MetaCatUtil.getLocalReplicationServerName()
+                +MetacatUtil.getLocalReplicationServerName()
                 +"&action=test");
       String test = MetacatReplication.getURLContent(u);
       //couldn't pass the test
@@ -1146,7 +1146,7 @@
       //in the key store, this is security issue
       String server = params.get("server")[0];
       URL u = new URL("https://" + server + "?server="
-                +MetaCatUtil.getLocalReplicationServerName()
+                +MetacatUtil.getLocalReplicationServerName()
                 +"&action=test");
       String test = MetacatReplication.getURLContent(u);
       //couldn't pass the test
@@ -1242,7 +1242,7 @@
       //try to open a https stream to test if the request server's public key
       //in the key store, this is security issue
       URL u = new URL("https://" + server + "?server="
-                +MetaCatUtil.getLocalReplicationServerName()
+                +MetacatUtil.getLocalReplicationServerName()
                 +"&action=test");
       String test = MetacatReplication.getURLContent(u);
       //couldn't pass the test
@@ -1278,7 +1278,7 @@
 
       // Append local server's name and replication servlet to doclist
       doclist.append("<?xml version=\"1.0\"?><replication>");
-      doclist.append("<server>").append(MetaCatUtil.getLocalReplicationServerName());
+      doclist.append("<server>").append(MetacatUtil.getLocalReplicationServerName());
       //doclist.append(util.getProperty("replicationpath"));
       doclist.append("</server><updates>");
 
@@ -1325,7 +1325,7 @@
         while(tablehasrows)
         {
           String recordDoctype = rs.getString(3);
-          Vector<String> packagedoctypes = MetaCatUtil.getOptionList(
+          Vector<String> packagedoctypes = MetacatUtil.getOptionList(
                                      PropertyService.getProperty("xml.packagedoctype"));
           //if this is a package file, put it at the end
           //because if a package file is read before all of the files it
@@ -1373,7 +1373,7 @@
           String recordDoctype = rs.getString(3);
           if(!recordDoctype.equals("BIN"))
           { //don't replicate data files
-            Vector<String> packagedoctypes = MetaCatUtil.getOptionList(
+            Vector<String> packagedoctypes = MetacatUtil.getOptionList(
                                      PropertyService.getProperty("xml.packagedoctype"));
             if(recordDoctype != null && !packagedoctypes.contains(recordDoctype))
             {   //if this is a package file, put it at the end
@@ -1777,7 +1777,7 @@
     Hashtable<String,String> sl = new Hashtable<String,String>();
     DBConnection dbConn = null;
     int serialNumber = -1;
-    docId=MetaCatUtil.getDocIdFromString(docId);
+    docId=MetacatUtil.getDocIdFromString(docId);
     PreparedStatement pstmt=null;
     int serverLocation;
     try
@@ -1868,7 +1868,7 @@
     int serialNumber = -1;
     PreparedStatement pstmt = null;
     int serverCode = 1;
-    String docId=MetaCatUtil.getDocIdFromString(accNum);
+    String docId=MetacatUtil.getDocIdFromString(accNum);
 
     try
     {
Index: src/edu/ucsb/nceas/metacat/SubTree.java
===================================================================
--- src/edu/ucsb/nceas/metacat/SubTree.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/SubTree.java	(revision 4698)
@@ -36,7 +36,7 @@
 import org.apache.log4j.Logger;
 import org.xml.sax.SAXException;
 
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 /**
  * A Class that represents an XML Subtree
@@ -220,7 +220,7 @@
            nodename = rs.getString(5);
            nodeprefix = rs.getString(6);
            nodedata = rs.getString(7);
-           nodedata = MetaCatUtil.normalize(nodedata);
+           nodedata = MetacatUtil.normalize(nodedata);
            // add the data to the node record list hashtable
            NodeRecord currentRecord = new NodeRecord(nodeid,parentnodeid,nodeindex,
                                       nodetype, nodename, nodeprefix, nodedata);
Index: src/edu/ucsb/nceas/metacat/IndexingQueue.java
===================================================================
--- src/edu/ucsb/nceas/metacat/IndexingQueue.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/IndexingQueue.java	(revision 4698)
@@ -34,7 +34,7 @@
 import java.lang.Comparable;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
 import org.apache.log4j.Logger;
Index: src/edu/ucsb/nceas/metacat/DocumentIdQuery.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DocumentIdQuery.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/DocumentIdQuery.java	(revision 4698)
@@ -31,114 +31,111 @@
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
 /**
- * Generate a pathquery document representing a metacat query for a list of 
+ * Generate a pathquery document representing a metacat query for a list of
  * document IDs.
  */
-public class DocumentIdQuery
-{
+public class DocumentIdQuery {
 
-    
-    /**
-     * Create an squery parameters table using an already-initialized hashtable
-     * 
-     * @param docidList an array of document identifiers to search for
-     * @param params the hashtable to add the query parameters to.
-     * 
-     */
-    public static Hashtable createDocidQueryParams(String[] docidList, Hashtable params)
-    {
-        params = getDefaultQueryParams();
-        if (docidList != null) {
-            params.put("/eml/@packageId", docidList);
-        }
-        return params;
-    }
-    
-    
-    /**
-     * Create an squery using some preset values for the query parameters, only
-     * passing in the document ids to be searched.
-     * 
-     * @param docidList an array of document identifiers to search for
-     */
-    public static String createDocidQuery(String[] docidList) throws PropertyNotFoundException
-    {
-        String pathQuery = "";
-        Hashtable params = getDefaultQueryParams();
-        if (docidList != null) {
-            params.put("/eml/@packageId", docidList);
-        }
-        
-        pathQuery = DBQuery.createSQuery(params);
-        return pathQuery;
-    }
-    
-    /**
-     * Create a paramter list containing default parameters for a query
-     * 
-     * @return Hashtable containing the default parameters
-     */
-    public static Hashtable getDefaultQueryParams()
-    {
-        Hashtable params = new Hashtable();
-        
-        String[] operator = new String[1];
-        operator[0] = "UNION";
-        params.put("operator", operator);
-        
-        String[] doctypes = new String[5];
-        doctypes[0] = "eml://ecoinformatics.org/eml-2.0.1";
-        doctypes[1] = "eml://ecoinformatics.org/eml-2.0.0";
-        doctypes[2] = "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN";
-        doctypes[3] = "-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN";
-        doctypes[4] = "metadata";
-        params.put("returndoctype", doctypes);
-        
-        String[] fields = new String[11];
-        fields[0]="originator/individualName/surName";
-        fields[1]="originator/individualName/givenName";
-        fields[2]="creator/individualName/surName";
-        fields[3]="creator/individualName/givenName";
-        fields[4]="originator/organizationName";
-        fields[5]="creator/organizationName";
-        fields[6]="dataset/title";
-        fields[7]="keyword";
-        fields[8]="idinfo/citation/citeinfo/title";
-        fields[9]="idinfo/citation/citeinfo/origin";
-        fields[10]="idinfo/keywords/theme/themekey";
-        params.put("returnfield", fields);
-        
-        return params;
-    }
-    
-    /**
-     * Main method used for testing the class output
-     * 
-     * @param args no arguments used in this main method
-     */
-    public static void main(String[] args)
-    {
-        String CONFIG_DIR = "lib";
-        File dirPath = new File(CONFIG_DIR);
-        try {
-        	PropertyService.getInstance(dirPath.getPath());
-        } catch (ServiceException ioe) {
-            System.err.println("Error in loading properties: "
-                    + ioe.getMessage());
-        }
-        
-        String[] ids = new String[3];
-        ids[0] = "ces_dataset.23.1";
-        ids[1] = "knb-lter-vcr.97.1";
-        ids[2] = "obfs.400.1";
-        
-        String pathquery = null;
-        try {
-        	pathquery = createDocidQuery(ids);
-        } catch (PropertyNotFoundException pnfe) {
-        	System.out.println("Could not create doc id query: " + pnfe.getMessage());
-        }
-        System.out.println(pathquery);
-    }
+	/**
+	 * Create an squery parameters table using an already-initialized hashtable
+	 * 
+	 * @param docidList
+	 *            an array of document identifiers to search for
+	 * @param params
+	 *            the hashtable to add the query parameters to.
+	 * 
+	 */
+	public static Hashtable createDocidQueryParams(String[] docidList, Hashtable params) {
+		params = getDefaultQueryParams();
+		if (docidList != null) {
+			params.put("/eml/@packageId", docidList);
+		}
+		return params;
+	}
 
+	/**
+	 * Create an squery using some preset values for the query parameters, only
+	 * passing in the document ids to be searched.
+	 * 
+	 * @param docidList
+	 *            an array of document identifiers to search for
+	 */
+	public static String createDocidQuery(String[] docidList)
+			throws PropertyNotFoundException {
+		String pathQuery = "";
+		Hashtable params = getDefaultQueryParams();
+		if (docidList != null) {
+			params.put("/eml/@packageId", docidList);
+		}
+
+		pathQuery = DBQuery.createSQuery(params);
+		return pathQuery;
+	}
+
+	/**
+	 * Create a paramter list containing default parameters for a query
+	 * 
+	 * @return Hashtable containing the default parameters
+	 */
+	public static Hashtable getDefaultQueryParams() {
+		Hashtable params = new Hashtable();
+
+		String[] operator = new String[1];
+		operator[0] = "UNION";
+		params.put("operator", operator);
+
+		String[] doctypes = new String[5];
+		doctypes[0] = "eml://ecoinformatics.org/eml-2.0.1";
+		doctypes[1] = "eml://ecoinformatics.org/eml-2.0.0";
+		doctypes[2] = "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN";
+		doctypes[3] = "-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN";
+		doctypes[4] = "metadata";
+		params.put("returndoctype", doctypes);
+
+		String[] fields = new String[11];
+		fields[0] = "originator/individualName/surName";
+		fields[1] = "originator/individualName/givenName";
+		fields[2] = "creator/individualName/surName";
+		fields[3] = "creator/individualName/givenName";
+		fields[4] = "originator/organizationName";
+		fields[5] = "creator/organizationName";
+		fields[6] = "dataset/title";
+		fields[7] = "keyword";
+		fields[8] = "idinfo/citation/citeinfo/title";
+		fields[9] = "idinfo/citation/citeinfo/origin";
+		fields[10] = "idinfo/keywords/theme/themekey";
+		params.put("returnfield", fields);
+
+		return params;
+	}
+
+	/**
+	 * Main method used for testing the class output
+	 * 
+	 * @param args
+	 *            no arguments used in this main method
+	 */
+	public static void main(String[] args) {
+		String CONFIG_DIR = "lib";
+		File dirPath = new File(CONFIG_DIR);
+		try {
+			PropertyService.getInstance();
+		} catch (ServiceException ioe) {
+			System.err.println("Error in loading properties: " + ioe.getMessage());
+		}
+
+		String[] ids = new String[3];
+		ids[0] = "ces_dataset.23.1";
+		ids[1] = "knb-lter-vcr.97.1";
+		ids[2] = "obfs.400.1";
+
+		String pathquery = null;
+		try {
+			pathquery = createDocidQuery(ids);
+		} catch (PropertyNotFoundException pnfe) {
+			System.out.println("Could not create doc id query: " + pnfe.getMessage());
+		}
+		System.out.println(pathquery);
+	}
+
 }
Index: src/edu/ucsb/nceas/metacat/MetaCatServlet.java
===================================================================
--- src/edu/ucsb/nceas/metacat/MetaCatServlet.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/MetaCatServlet.java	(revision 4698)
@@ -78,6 +78,7 @@
 import edu.ucsb.nceas.metacat.service.DatabaseService;
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.service.ServiceException;
+import edu.ucsb.nceas.metacat.service.ServiceService;
 import edu.ucsb.nceas.metacat.service.SessionService;
 import edu.ucsb.nceas.metacat.service.SkinPropertyService;
 import edu.ucsb.nceas.metacat.service.XMLSchemaService;
@@ -84,7 +85,7 @@
 import edu.ucsb.nceas.metacat.spatial.SpatialHarvester;
 import edu.ucsb.nceas.metacat.spatial.SpatialQuery;
 import edu.ucsb.nceas.metacat.util.AuthUtil;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.metacat.util.RequestUtil;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 import edu.ucsb.nceas.metacat.util.SessionData;
@@ -163,7 +164,6 @@
     public static final String NONAMESPACELOCATION = ":noNamespaceSchemaLocation";
     public static final String EML2KEYWORD = ":eml";
     public static final String XMLFORMAT = "xml";
-    private static final String CONFIG_DIR = "WEB-INF";
     private static final String FALSE = "false";
     private static final String TRUE  = "true";
     
@@ -176,27 +176,25 @@
             super.init(config);
             
             ServletContext context = config.getServletContext();
-             
+            
+            ServiceService serviceService = ServiceService.getInstance(context);
+            logMetacat.debug("ServiceService singleton created " + serviceService);
+            
             // Initialize the properties file
-            String dirPath = context.getRealPath(CONFIG_DIR);
+            String dirPath = ServiceService.getRealConfigDir();
             
             String LOG_CONFIG_NAME = dirPath + "/log4j.properties";
             PropertyConfigurator.configureAndWatch(LOG_CONFIG_NAME);
             
-            PropertyService propertyService = PropertyService.getInstance(dirPath);
-            logMetacat.debug("PropertyService singleton created " + propertyService);
+            // Register preliminary services
+            ServiceService.registerService("PropertyService", PropertyService.getInstance());
+            ServiceService.registerService("SkinPropertyService", SkinPropertyService.getInstance());
+            ServiceService.registerService("SessionService", SessionService.getInstance()); 
             
-            SkinPropertyService skinPropertyService = SkinPropertyService.getInstance(context);
-            logMetacat.debug("PropertyService singleton created " + skinPropertyService);
-            
-            SessionService sessionService = SessionService.getInstance();
-            logMetacat.debug("SessionService singleton created " + sessionService);
-            
-            
     		// Check to see if the user has requested to bypass configuration 
             // (dev option) and check see if metacat has been configured.
     		// If both are false then stop the initialization
-            if (!MetaCatUtil.bypassConfiguration() && !MetaCatUtil.isMetacatConfigured()) {
+            if (!MetacatUtil.bypassConfiguration() && !MetacatUtil.isMetacatConfigured()) {
             	return;
             }  
             
@@ -207,6 +205,11 @@
         		"Service problem while intializing MetaCat Servlet: " + se.getMessage();
             logMetacat.error(errorMessage);
             throw new ServletException(errorMessage);
+        } catch (UtilException ue) {
+        	String errorMessage = 
+        		"Utility problem while intializing MetaCat Servlet: " + ue.getMessage();
+            logMetacat.error(errorMessage);
+            throw new ServletException(errorMessage);
         } 
     }
 
@@ -221,16 +224,14 @@
 	public void initSecondHalf(ServletContext context) throws ServletException {
 		Logger logMetacat = Logger.getLogger(MetaCatServlet.class);
 
-		try {
-            DatabaseService databaseService = DatabaseService.getInstance();
-            logMetacat.debug("DatabaseService singleton created " + databaseService);
+		try {			
+			ServiceService.registerService("DatabaseService", DatabaseService.getInstance());
 			
 			// initialize DBConnection pool
 			DBConnectionPool connPool = DBConnectionPool.getInstance();
 			logMetacat.debug("DBConnection pool initialized: " + connPool.toString());
 			
-			XMLSchemaService xmlService = XMLSchemaService.getInstance();
-			logMetacat.debug("XMLService initialized: " + xmlService.toString());
+			ServiceService.registerService("XMLSchemaService", XMLSchemaService.getInstance());
 
 			// check if eml201 document were corrected or not. if not, correct
 			// eml201 documents.
@@ -321,7 +322,12 @@
 					+ gpe.getMessage();
 			logMetacat.error(errorMessage);
 			throw new ServletException(errorMessage);
-		}
+		} catch (ServiceException se) {
+			String errorMessage = "Service problem while intializing MetaCat Servlet: "
+				+ se.getMessage();
+			logMetacat.error(errorMessage);
+			throw new ServletException(errorMessage);
+		} 
 	}
     
     /**
@@ -358,19 +364,19 @@
         Logger logMetacat = Logger.getLogger(MetaCatServlet.class);
         
         try {
-        	MetaCatUtil.pathsForIndexing
-                = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
+        	MetacatUtil.pathsForIndexing
+                = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
         
-        	MetaCatUtil.pathsForIndexing = 
-        		MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
+        	MetacatUtil.pathsForIndexing = 
+        		MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
         }
         catch (PropertyNotFoundException pnfe) {
-        	MetaCatUtil.pathsForIndexing = null;
+        	MetacatUtil.pathsForIndexing = null;
             logMetacat.error("Could not find index paths.  Setting " 
-            		+ "MetaCatUtil.pathsForIndexing to null: " + pnfe.getMessage());
+            		+ "MetacatUtil.pathsForIndexing to null: " + pnfe.getMessage());
         }
         
-        if (MetaCatUtil.pathsForIndexing != null) {
+        if (MetacatUtil.pathsForIndexing != null) {
             
             logMetacat.debug("Indexing paths specified in metacat.properties....");
             
@@ -380,9 +386,9 @@
             PreparedStatement pstmt1 = null;
             ResultSet rs = null;
             
-            for (int i = 0; i < MetaCatUtil.pathsForIndexing.size(); i++) {
+            for (int i = 0; i < MetacatUtil.pathsForIndexing.size(); i++) {
                 logMetacat.debug("Checking if '"
-                        + (String) MetaCatUtil.pathsForIndexing.elementAt(i)
+                        + (String) MetacatUtil.pathsForIndexing.elementAt(i)
                         + "' is indexed.... ");
                 
                 try {
@@ -393,7 +399,7 @@
                     
                     pstmt = conn.prepareStatement(
                             "SELECT * FROM xml_path_index " + "WHERE path = ?");
-                    pstmt.setString(1, (String) MetaCatUtil.pathsForIndexing
+                    pstmt.setString(1, (String) MetacatUtil.pathsForIndexing
                             .elementAt(i));
                     
                     pstmt.execute();
@@ -407,9 +413,9 @@
                         
                         logMetacat.debug(
                                 "Inserting following path in xml_path_index: "
-                                + (String)MetaCatUtil.pathsForIndexing
+                                + (String)MetacatUtil.pathsForIndexing
                                 .elementAt(i));
-                        if(((String)MetaCatUtil.pathsForIndexing.elementAt(i)).indexOf("@")<0){
+                        if(((String)MetacatUtil.pathsForIndexing.elementAt(i)).indexOf("@")<0){
                             pstmt = conn.prepareStatement("SELECT DISTINCT n.docid, "
                                     + "n.nodedata, n.nodedatanumerical, n.parentnodeid"
                                     + " FROM xml_nodes n, xml_index i WHERE"
@@ -422,7 +428,7 @@
                                     + " i.path = ? and n.nodeid=i.nodeid and"
                                     + " n.nodetype LIKE 'ATTRIBUTE' order by n.parentnodeid");
                         }
-                        pstmt.setString(1, (String) MetaCatUtil.
+                        pstmt.setString(1, (String) MetacatUtil.
                                 pathsForIndexing.elementAt(i));
                         pstmt.execute();
                         rs = pstmt.getResultSet();
@@ -430,7 +436,7 @@
                         int count = 0;
                         logMetacat.debug(
                                 "Executed the select statement for: "
-                                + (String) MetaCatUtil.pathsForIndexing
+                                + (String) MetacatUtil.pathsForIndexing
                                 .elementAt(i));
                         
                         try {
@@ -449,7 +455,7 @@
                                             + " VALUES (?, ?, ?, ?, ?)");
                                     
                                     pstmt1.setString(1, docid);
-                                    pstmt1.setString(2, (String) MetaCatUtil.
+                                    pstmt1.setString(2, (String) MetacatUtil.
                                             pathsForIndexing.elementAt(i));
                                     pstmt1.setString(3, nodedata);
                                     pstmt1.setFloat(4, nodedatanumerical);
@@ -473,7 +479,7 @@
                         
                         logMetacat.info("Indexed " + count
                                 + " records from xml_nodes for '"
-                                + (String) MetaCatUtil.pathsForIndexing.elementAt(i)
+                                + (String) MetacatUtil.pathsForIndexing.elementAt(i)
                                 + "'");
                         
                     } else {
@@ -514,16 +520,14 @@
 		
 		// Each time metacat is called, check to see if metacat has been 
 		// configured. If not then forward to the administration servlet
-		if (!MetaCatUtil.isMetacatConfigured()) {
+		if (!MetacatUtil.isMetacatConfigured()) {
 			RequestUtil.forwardRequest(request, response, "/admin?action=configure");
 			return;
 		}
 
 		// if we get here, metacat is configured.  If we have not completed the 
-		// second half of the intialization, do so now.  This allows us to initially
+		// second half of the initialization, do so now.  This allows us to initially
 		// configure metacat without a restart.
-		// TODO MCD eventually put in more intelligent reinitialization code so we
-		// can change (some) properties without restarting metacat.
 		if (!fullyInitialized) {
 			initSecondHalf(request.getSession().getServletContext());
 		}
@@ -846,7 +850,7 @@
 					 * out.println(" Ref: " + u.getRef()); String pquery =
 					 * u.getQuery(); out.println(" Query: " + pquery);
 					 * out.println(" Params: "); if (pquery != null) { Hashtable
-					 * qparams = MetaCatUtil.parseQuery(u.getQuery()); for
+					 * qparams = MetacatUtil.parseQuery(u.getQuery()); for
 					 * (Enumeration en = qparams.keys(); en .hasMoreElements();) {
 					 * String pname = (String) en.nextElement(); String pvalue =
 					 * (String) qparams.get(pname); out.println(" " + pname + ": " +
@@ -864,7 +868,7 @@
 					// TODO MCD this interface is for testing.  It should go through a 
 					// ServiceService class and only work for an admin user.  Move to the
 					// MetacatAdminServlet
-					XMLSchemaService.getInstance().refresh();
+					ServiceService.refreshService("XMLSchemaService");
 					return;
 				}else {
 					PrintWriter out = response.getWriter();
@@ -891,6 +895,10 @@
 			String errorString = "Utility error: " + ue.getMessage();
 			logMetacat.error(errorString);
 			throw new ServletException(errorString);
+		} catch (ServiceException ue) {
+			String errorString = "Service error: " + ue.getMessage();
+			logMetacat.error(errorString);
+			throw new ServletException(errorString);
 		}
 	}
     
@@ -1221,10 +1229,10 @@
         Logger logMetacat = Logger.getLogger(MetaCatServlet.class);
         logMetacat.warn("Total search time for action 'squery': "
                 + (outPutTime - startTime));
-        MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------"+
+        MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------"+
                 "-------------------------------------------------------------------------------Total search time for "
                 + (outPutTime - startTime));
-        MetaCatUtil.writeDebugToDelimiteredFile(" "+ (outPutTime - startTime), true);
+        MetacatUtil.writeDebugToDelimiteredFile(" "+ (outPutTime - startTime), true);
     }
     
     /**
@@ -1250,10 +1258,10 @@
         Logger logMetacat = Logger.getLogger(MetaCatServlet.class);
         logMetacat.warn("Total search time for action 'query': "
                 + (outPutTime - startTime));
-        MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------"+
+        MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------"+
                 "-------------------------------------------------------------------------------Total search time is "
                 + (outPutTime - startTime));
-        MetaCatUtil.writeDebugToDelimiteredFile(" "+ (outPutTime - startTime), true);
+        MetacatUtil.writeDebugToDelimiteredFile(" "+ (outPutTime - startTime), true);
         
         //handleSQuery(out, params, response,user, groups, sessionid);
     }
@@ -1383,7 +1391,7 @@
                 throw new Exception("You didn't specify requested inlinedataid"); }
             
             // check for permission
-            docId = MetaCatUtil
+            docId = MetacatUtil
                     .getDocIdWithoutRevFromInlineDataID(inlineDataId);
             PermissionController controller = new PermissionController(docId);
             // check top level read permission
@@ -1398,7 +1406,7 @@
                     Hashtable<String,String> unReadableInlineDataList =
                             PermissionController.getUnReadableInlineDataIdList(docId,
                             user, groups, false);
-                    String inlineDataIdWithoutRev = MetaCatUtil.getInlineDataIdWithoutRev(inlineDataId);
+                    String inlineDataIdWithoutRev = MetacatUtil.getInlineDataIdWithoutRev(inlineDataId);
                     if (unReadableInlineDataList.containsValue(inlineDataIdWithoutRev)) {
                         throw new Exception("User " + user
                                 + " doesn't have permission " + " to read inlinedata "
@@ -1457,57 +1465,6 @@
         }
     }
     
-//    /*
-//     * Get the nodeid from xml_nodes for the inlinedataid
-//     */
-//    private long getInlineDataNodeId(String inLineDataId, String docId)
-//    throws SQLException {
-//        Logger logMetacat = Logger.getLogger(MetaCatServlet.class);
-//        long nodeId = 0;
-//        String INLINE = "inline";
-//        boolean hasRow;
-//        PreparedStatement pStmt = null;
-//        DBConnection conn = null;
-//        int serialNumber = -1;
-//        String sql = "SELECT nodeid FROM xml_nodes WHERE docid=? AND nodedata=? "
-//                + "AND nodetype='TEXT' AND parentnodeid IN "
-//                + "(SELECT nodeid FROM xml_nodes WHERE docid=? AND "
-//                + "nodetype='ELEMENT' AND nodename='" + INLINE + "')";
-//        
-//        try {
-//            //check out DBConnection
-//            conn = DBConnectionPool
-//                    .getDBConnection("AccessControlList.isAllowFirst");
-//            serialNumber = conn.getCheckOutSerialNumber();
-//            
-//            pStmt = conn.prepareStatement(sql);
-//            //bind value
-//            pStmt.setString(1, docId);//docid
-//            pStmt.setString(2, inLineDataId);//inlinedataid
-//            pStmt.setString(3, docId);
-//            // excute query
-//            pStmt.execute();
-//            ResultSet rs = pStmt.getResultSet();
-//            hasRow = rs.next();
-//            // get result
-//            if (hasRow) {
-//                nodeId = rs.getLong(1);
-//            }//if
-//            
-//        } catch (SQLException e) {
-//            throw e;
-//        } finally {
-//            try {
-//                pStmt.close();
-//            } finally {
-//                DBConnectionPool.returnDBConnection(conn, serialNumber);
-//            }
-//        }
-//        logMetacat.debug("The nodeid for inlinedataid " + inLineDataId
-//                + " is: " + nodeId);
-//        return nodeId;
-//    }
-    
     /**
      * Handle the "read" request of metadata/data files from Metacat or any
      * files from Internet; transformed metadata XML document into HTML
@@ -1566,7 +1523,7 @@
                 try {
                     
                     URL murl = new URL(docs[i]);
-                    Hashtable<String,String> murlQueryStr = MetaCatUtil.parseQuery(
+                    Hashtable<String,String> murlQueryStr = MetacatUtil.parseQuery(
                             murl.getQuery());
                     // case docid="http://.../?docid=aaa"
                     // or docid="metacat://.../?docid=bbb"
@@ -2369,7 +2326,7 @@
                     // Delete from spatial cache if runningSpatialOption
                     if ( PropertyService.getProperty("spatial.runSpatialOption").equals("true") ) {
                         SpatialHarvester sh = new SpatialHarvester();
-                        sh.addToDeleteQue( MetaCatUtil.getSmartDocId( docid[0] ) );
+                        sh.addToDeleteQue( MetacatUtil.getSmartDocId( docid[0] ) );
                         sh.destroy();
                     }
                     
@@ -2893,7 +2850,7 @@
                     String fileTempLocation;
                     
                     // the filePart will be clobbered on the next loop, save to disk
-                    fileTempLocation = MetaCatUtil.writeTempFile(filePart, fileName);
+                    fileTempLocation = MetacatUtil.writeTempFile(filePart, fileName);
                     fileList.put(name, fileTempLocation);
                     fileList.put("filename", fileName);
                     fileList.put("name", fileTempLocation);
@@ -3064,7 +3021,7 @@
                     // copy file to desired output location
                     try 
                     {
-                        MetaCatUtil.copyFile(tempFileName, newFileName);
+                        MetacatUtil.copyFile(tempFileName, newFileName);
                     } 
                     catch (IOException ioe) 
                     {
@@ -3187,7 +3144,7 @@
                             if ( fileExists == false ) {
                                 // copy file to desired output location
                                 try {
-                                    MetaCatUtil.copyFile(tempFileName, newFileName);
+                                    MetacatUtil.copyFile(tempFileName, newFileName);
                                 } catch (IOException ioe) {
                                     logMetacat.error("IO Exception copying file: " +
                                             ioe.getMessage());
@@ -3344,7 +3301,7 @@
         Vector<String> packageSet = null;
         try {
         	packageSet = 
-        		MetaCatUtil.getOptionList(PropertyService.getProperty("xml.packagedoctypeset"));
+        		MetacatUtil.getOptionList(PropertyService.getProperty("xml.packagedoctypeset"));
         } catch (PropertyNotFoundException pnfe) {
         	logMetacat.error("Could not find package doctype set.  Setting to null: " 
         			+ pnfe.getMessage());
@@ -3464,7 +3421,7 @@
         int serialNumber = -1;
         
         // get rid of revision if access number has
-        docId = MetaCatUtil.getDocIdFromString(accessionNumber);
+        docId = MetacatUtil.getDocIdFromString(accessionNumber);
         try {
             //check out DBConnection
             conn = DBConnectionPool
Index: src/edu/ucsb/nceas/metacat/ContentTypeProvider.java
===================================================================
--- src/edu/ucsb/nceas/metacat/ContentTypeProvider.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/ContentTypeProvider.java	(revision 4698)
@@ -57,7 +57,7 @@
 import org.ecoinformatics.eml.EMLParser;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 /**
  * This class will figure out which content type it is for a given data file.
@@ -121,7 +121,7 @@
    */
   public ContentTypeProvider(String docIdWithRevision)
   {
-    dataFileId = MetaCatUtil.getDocIdFromString(docIdWithRevision);
+    dataFileId = MetacatUtil.getDocIdFromString(docIdWithRevision);
     //get relative doclist for data file and package type
     Vector docLists = null;
     docLists = getRelativeDocIdList(dataFileId);
@@ -342,10 +342,10 @@
           if (URLData.indexOf(DBSAXHandler.ECOGRID) != -1 )
           {
             // Get docid from url
-            String docId = MetaCatUtil.
+            String docId = MetacatUtil.
                                getAccessionNumberFromEcogridIdentifier(URLData);
             // Get rid of revision
-            docId = MetaCatUtil.getDocIdFromAccessionNumber(docId);
+            docId = MetacatUtil.getDocIdFromAccessionNumber(docId);
             logMetacat.info("docid from url element in xml is: " +
                                      docId);
             //if this docid equals target one, we find it
@@ -403,7 +403,7 @@
       }//while
 
       // set up data package type
-      if ((MetaCatUtil.getOptionList(PropertyService.getProperty("xml.packagedoctype"))).
+      if ((MetacatUtil.getOptionList(PropertyService.getProperty("xml.packagedoctype"))).
                                      contains(packType))
       {
         //this is beta4 or beta6 version
@@ -410,7 +410,7 @@
         logMetacat.warn("This is beta package");
         packageType = BETA;
       }
-      else if ((MetaCatUtil.getOptionList
+      else if ((MetacatUtil.getOptionList
                (PropertyService.getProperty("xml.eml2_0_0namespace"))).contains(packType))
       {
         // this eml 2 document
@@ -417,7 +417,7 @@
         logMetacat.warn("This is EML2.0.0 package");
         packageType = EML2;
       }
-      else if ((MetaCatUtil.getOptionList
+      else if ((MetacatUtil.getOptionList
                (PropertyService.getProperty("xml.eml2_0_1namespace"))).contains(packType))
       {
         // this eml 2 document
@@ -503,7 +503,7 @@
         String packType = rs.getString(1);
         String targetId  = rs.getString(2);
         // find physical document
-        if ((MetaCatUtil.getOptionList(PropertyService.getProperty(targetType))).
+        if ((MetacatUtil.getOptionList(PropertyService.getProperty(targetType))).
                                      contains(packType))
        {
          // assign physical document and jump out the while loop
Index: src/edu/ucsb/nceas/metacat/IndexingTimerTask.java
===================================================================
--- src/edu/ucsb/nceas/metacat/IndexingTimerTask.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/IndexingTimerTask.java	(revision 4698)
@@ -35,7 +35,7 @@
 
 import edu.ucsb.nceas.metacat.service.DatabaseService;
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 import org.apache.log4j.Logger;
 
@@ -60,7 +60,7 @@
 	    		
 	    		dbConn = DBConnectionPool.getDBConnection("IndexingThread");
 	    		serialNumber = dbConn.getCheckOutSerialNumber();
-	            Vector indexNamespaces = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexNamespaces"));
+	            Vector indexNamespaces = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexNamespaces"));
 	            String nonJoinCriteria = "b.docid is NULL";
 	    		boolean first = true;
 
Index: src/edu/ucsb/nceas/metacat/PermissionController.java
===================================================================
--- src/edu/ucsb/nceas/metacat/PermissionController.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/PermissionController.java	(revision 4698)
@@ -37,7 +37,7 @@
 import org.apache.log4j.Logger;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
 public class PermissionController
@@ -59,7 +59,7 @@
    public PermissionController(String myDocid) throws McdbException
    {
      // Get rid of rev number
-     docId = MetaCatUtil.getSmartDocId(myDocid);
+     docId = MetacatUtil.getSmartDocId(myDocid);
      //hasSubTreeAccessControl = checkSubTreeAccessControl();
    }
 
@@ -76,7 +76,7 @@
      }
      else
      {
-         docId = MetaCatUtil.getDocIdFromAccessionNumber(myDocid);
+         docId = MetacatUtil.getDocIdFromAccessionNumber(myDocid);
      }
    }
 
@@ -431,7 +431,7 @@
 	 */
 	private boolean isAccessDocument(String docId) throws SQLException {
 		// detele the rev number if docid contains it
-		docId = MetaCatUtil.getDocIdFromString(docId);
+		docId = MetacatUtil.getDocIdFromString(docId);
 		PreparedStatement pStmt = null;
 		DBConnection conn = null;
 		int serialNumber = -1;
@@ -453,7 +453,7 @@
 
 			// if it is an access document
 			if (doctype != null
-					&& ((MetaCatUtil.getOptionList(PropertyService
+					&& ((MetacatUtil.getOptionList(PropertyService
 							.getProperty("xml.accessdoctype")).contains(doctype)))) {
 
 				return true;
@@ -1106,11 +1106,11 @@
             {
                 logMetacat.info("Put subtree id " + subTreeId +
                                          " and " + "inline data file name " +
-                                         MetaCatUtil.
+                                         MetacatUtil.
                                          getInlineDataIdWithoutRev(fileId) +
                                          " into " + "un" + permission +
                                          " hash");
-                unAccessibleIdList.put(subTreeId, MetaCatUtil.
+                unAccessibleIdList.put(subTreeId, MetacatUtil.
                                       getInlineDataIdWithoutRev(fileId));
             }
         }
Index: src/edu/ucsb/nceas/metacat/DocumentImpl.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DocumentImpl.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/DocumentImpl.java	(revision 4698)
@@ -59,7 +59,7 @@
 import edu.ucsb.nceas.metacat.service.XMLSchemaService;
 import edu.ucsb.nceas.metacat.spatial.SpatialHarvester;
 import edu.ucsb.nceas.metacat.util.AuthUtil;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 import edu.ucsb.nceas.utilities.FileUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
@@ -183,8 +183,8 @@
     {
         try {
             //this.conn = conn;
-            this.docid = MetaCatUtil.getDocIdFromAccessionNumber(accNum);
-            this.rev   = MetaCatUtil.getRevisionFromAccessionNumber(accNum);
+            this.docid = MetacatUtil.getDocIdFromAccessionNumber(accNum);
+            this.rev   = MetacatUtil.getRevisionFromAccessionNumber(accNum);
 
             // Look up the document information
             getDocumentInfo(docid, rev);
@@ -334,8 +334,8 @@
             serialNumber = conn.getCheckOutSerialNumber();
             conn.setAutoCommit(false);
             String action = null;
-            String docIdWithoutRev = MetaCatUtil.getDocIdFromAccessionNumber(accnum);
-            int userSpecifyRev = MetaCatUtil.getRevisionFromAccessionNumber(accnum);
+            String docIdWithoutRev = MetacatUtil.getDocIdFromAccessionNumber(accnum);
+            int userSpecifyRev = MetacatUtil.getRevisionFromAccessionNumber(accnum);
             action = checkRevInXMLDocuments(docIdWithoutRev, userSpecifyRev);
             logMetacat.warn("after check rev, the action is "+action);
             if (action.equals("UPDATE"))
@@ -414,8 +414,8 @@
             serialNumber = conn.getCheckOutSerialNumber();
             conn.setAutoCommit(false);
             String action = null;
-            String docIdWithoutRev = MetaCatUtil.getDocIdFromAccessionNumber(accnum);
-            int userSpecifyRev = MetaCatUtil.getRevisionFromAccessionNumber(accnum);
+            String docIdWithoutRev = MetacatUtil.getDocIdFromAccessionNumber(accnum);
+            int userSpecifyRev = MetacatUtil.getRevisionFromAccessionNumber(accnum);
             if (tableName.equals(DOCUMENTTABLE))
             {
                 action = checkRevInXMLDocuments(docIdWithoutRev, userSpecifyRev);
@@ -743,8 +743,8 @@
             throws Exception
     {
         boolean flag = true;
-        String docid = MetaCatUtil.getDocIdFromString(accnum);
-        int rev = MetaCatUtil.getVersionFromString(accnum);
+        String docid = MetacatUtil.getDocIdFromString(accnum);
+        int rev = MetacatUtil.getVersionFromString(accnum);
 
         if (serverCode == 1) {
             flag = true;
@@ -764,7 +764,7 @@
                     .getServerNameForServerCode(serverCode);
             MetacatReplication.replLog("attempting to lock " + accnum);
             URL u = new URL("https://" + server + "?server="
-                    + MetaCatUtil.getLocalReplicationServerName()
+                    + MetacatUtil.getLocalReplicationServerName()
                     + "&action=getlock&updaterev=" + rev + "&docid=" + docid);
             //System.out.println("sending message: " + u.toString());
             String serverResStr = MetacatReplication.getURLContent(u);
@@ -1195,7 +1195,7 @@
                     // if it is inline data first to get the inline data
                     // internal id
                     String fileName = currentNode.getNodeData();
-                    String accessfileName = MetaCatUtil
+                    String accessfileName = MetacatUtil
                             .getDocIdWithoutRevFromInlineDataID(fileName);
                     // check if user has read permision for this inline data
                     boolean readInlinedata = false;
@@ -1724,7 +1724,7 @@
                       currentName, docid, doctype, parentId));
                   }
                 }
-                if( MetaCatUtil.pathsForIndexing.contains(currentName) &&
+                if( MetacatUtil.pathsForIndexing.contains(currentName) &&
                     leafData.trim().length() != 0 ){
                 	logMetacat.debug("paths found for indexing: " + currentName);
                 	pathsFoundForIndexing.put(currentName, new PathIndexEntry(
@@ -1748,7 +1748,7 @@
                 logMetacat.debug("B: " + path +"\n");
                 pathList.put(path, new PathIndexEntry(leafNodeId, path, docid,
                     doctype, parentId));
-                if( MetaCatUtil.pathsForIndexing.contains(path) &&
+                if( MetacatUtil.pathsForIndexing.contains(path) &&
                     leafData.trim().length() != 0 ){
                 	logMetacat.debug("paths found for indexing: " + currentName);
                 	pathsFoundForIndexing.put(path, new PathIndexEntry(
@@ -1765,7 +1765,7 @@
                 logMetacat.debug("C: " + fullPath +"\n");
                 pathList.put(fullPath, new PathIndexEntry(leafNodeId, fullPath,
                     docid, doctype, parentId));
-                if( MetaCatUtil.pathsForIndexing.contains(fullPath) &&
+                if( MetacatUtil.pathsForIndexing.contains(fullPath) &&
                    leafData.trim().length() != 0 ){
                 	logMetacat.debug("paths found for indexing: " + currentName);
                 	pathsFoundForIndexing.put(fullPath, new PathIndexEntry(
@@ -1785,7 +1785,7 @@
      */
     private void deleteNodeIndex(DBConnection conn) throws SQLException
     {
-        //String familyId = MetaCatUtil.getDocIdFromString(docid);
+        //String familyId = MetacatUtil.getDocIdFromString(docid);
     	double start = System.currentTimeMillis()/1000;
         String familyId = docid;
         String sql = "DELETE FROM xml_index WHERE docid = ?";
@@ -2054,7 +2054,7 @@
                 if (!server.equals("localhost")) {
                     this.docHomeServer = server;
                 } else {
-                    this.docHomeServer = MetaCatUtil
+                    this.docHomeServer = MetacatUtil
                             .getLocalReplicationServerName();
                 }
                 logMetacat.info("server: " + docHomeServer);
@@ -2173,7 +2173,7 @@
                 try
                 {
                 	logMetacat.debug("Node data in read process before normalize=== "+nodedata);
-                	nodedata = MetaCatUtil.normalize(nodedata);
+                	nodedata = MetacatUtil.normalize(nodedata);
                 	logMetacat.debug("Node data in read process after normalize==== "+nodedata);
                 } catch (java.lang.StringIndexOutOfBoundsException SIO){
                 	logMetacat.warn("StringIndexOutOfBoundsException in normalize() while reading the document");
@@ -2538,13 +2538,13 @@
             }
 
             //DocumentIdentifier id = new DocumentIdentifier(accnum);
-            int revision = MetaCatUtil.getRevisionFromAccessionNumber(accnum);
+            int revision = MetacatUtil.getRevisionFromAccessionNumber(accnum);
             String updaterev = (new Integer(revision)).toString();
             String server = MetacatReplication
                     .getServerNameForServerCode(serverCode);
             MetacatReplication.replLog("attempting to lock " + accnum);
             URL u = new URL("https://" + server + "?server="
-                    + MetaCatUtil.getLocalReplicationServerName()
+                    + MetacatUtil.getLocalReplicationServerName()
                     + "&action=getlock&updaterev=" + updaterev + "&docid="
                     + docid);
             //System.out.println("sending message: " + u.toString());
@@ -2769,10 +2769,10 @@
         String catalogId = null;
         logMetacat.info("user in replication" + user);
         // Docid without revision
-        String docid = MetaCatUtil.getDocIdFromAccessionNumber(accnum);
+        String docid = MetacatUtil.getDocIdFromAccessionNumber(accnum);
         logMetacat.warn("The docid without rev is " + docid);
         // Revision specified by user (int)
-        int userSpecifyRev = MetaCatUtil.getRevisionFromAccessionNumber(accnum);
+        int userSpecifyRev = MetacatUtil.getRevisionFromAccessionNumber(accnum);
         logMetacat.warn("The user specifyRev: " + userSpecifyRev);
         // Revision for this docid in current database
         int revInDataBase = DBUtil.getLatestRevisionInDocumentTable(docid);
@@ -2921,9 +2921,9 @@
         try {
             String packagedoctype = PropertyService.getProperty("xml.packagedoctype");
             Vector<String> packagedoctypes = new Vector<String>();
-            packagedoctypes = MetaCatUtil.getOptionList(packagedoctype);
-            String docIdWithoutRev = MetaCatUtil.getDocIdFromAccessionNumber(accnumber);
-            int revision = MetaCatUtil.getRevisionFromAccessionNumber(accnumber);
+            packagedoctypes = MetacatUtil.getOptionList(packagedoctype);
+            String docIdWithoutRev = MetacatUtil.getDocIdFromAccessionNumber(accnumber);
+            int revision = MetacatUtil.getRevisionFromAccessionNumber(accnumber);
             if (documenttype != null &&
                     packagedoctypes.contains(documenttype)) {
                 dbconn = DBConnectionPool.getDBConnection(
@@ -2934,8 +2934,8 @@
                 String aclidWithRev = RelationHandler.getAccessFileIDWithRevision(docIdWithoutRev);
                 if (aclidWithRev != null)
                 {
-                  String aclid = MetaCatUtil.getDocIdFromAccessionNumber(aclidWithRev);
-                  revision = MetaCatUtil.getRevisionFromAccessionNumber(aclidWithRev);
+                  String aclid = MetacatUtil.getDocIdFromAccessionNumber(aclidWithRev);
+                  revision = MetacatUtil.getRevisionFromAccessionNumber(aclidWithRev);
                  
                   // if there are access file, write ACL for that package
                   if (aclid != null) {
@@ -2948,7 +2948,7 @@
             }
             // if it is an access file
             else if (documenttype != null
-                    && MetaCatUtil.getOptionList(
+                    && MetacatUtil.getOptionList(
                             PropertyService.getProperty("xml.accessdoctype")).contains(
                             documenttype)) {
                 dbconn = DBConnectionPool.getDBConnection(
@@ -3003,7 +3003,7 @@
         int serialNumber = -1;
         try {
             //get rid of revision number
-            docid = MetaCatUtil.getDocIdFromString(accnumber);
+            docid = MetacatUtil.getDocIdFromString(accnumber);
             dbConnection = DBConnectionPool.getDBConnection(
                     "DocumentImpl.getDocTypeFromDBForCurrentDoc");
             serialNumber = dbConnection.getCheckOutSerialNumber();
@@ -3057,7 +3057,7 @@
             // NEW - WHEN CLIENT ALWAYS PROVIDE ACCESSION NUMBER INCLUDING REV
             // IN IT
             //AccessionNumber ac = new AccessionNumber(accnum, "DELETE");
-            String docid = MetaCatUtil.getDocIdFromAccessionNumber(accnum);
+            String docid = MetacatUtil.getDocIdFromAccessionNumber(accnum);
             //String rev = ac.getRev();
 
             // Check if the document exists.
@@ -3655,7 +3655,7 @@
             throws SQLException
     {
         //get rid of revNum part
-        String docId = MetaCatUtil.getDocIdFromString(accNum);
+        String docId = MetacatUtil.getDocIdFromString(accNum);
         PreparedStatement pStmt = null;
         int serverLocation = 1;
         DBConnection conn = null;
@@ -3717,7 +3717,7 @@
         int serialNumber = -1;
 
         //we should consider about local host too
-        if (serverName.equals(MetaCatUtil.getLocalReplicationServerName())) {
+        if (serverName.equals(MetacatUtil.getLocalReplicationServerName())) {
             serverLocation = 1;
             return serverLocation;
         }
@@ -3801,7 +3801,7 @@
             // If the server is not in the table, and server is not local host,
             // insert it
             if (!hasRow
-                    && !server.equals(MetaCatUtil
+                    && !server.equals(MetacatUtil
                             .getLocalReplicationServerName())) {
                 // Set auto commit false
                 dbConn.setAutoCommit(false);
@@ -4139,9 +4139,9 @@
             dbconn = DBConnectionPool.getDBConnection(
                     "DeletedDocumentImpl.registerDeletedDataFile");
             serialNumber = dbconn.getCheckOutSerialNumber();
-            String docIdWithoutRev = MetaCatUtil
+            String docIdWithoutRev = MetacatUtil
                     .getDocIdFromAccessionNumber(accnum);
-            String rev = MetaCatUtil.getRevisionStringFromString(accnum);
+            String rev = MetacatUtil.getRevisionStringFromString(accnum);
             writeDocumentToRevisionTable(dbconn, docIdWithoutRev, 
                     rev, doctype, docname, user,
                     null, serverCode, -1, createDate, updateDate); 
Index: src/edu/ucsb/nceas/metacat/ReplicationHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/ReplicationHandler.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/ReplicationHandler.java	(revision 4698)
@@ -28,7 +28,7 @@
 
 import edu.ucsb.nceas.metacat.service.DatabaseService;
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
 import java.sql.*;
@@ -64,7 +64,7 @@
   int serverCheckCode = 1;
   ReplicationServerList serverList = null;
   //PrintWriter out;
-//  private static final AbstractDatabase dbAdapter = MetaCatUtil.dbAdapter;
+//  private static final AbstractDatabase dbAdapter = MetacatUtil.dbAdapter;
   private static Logger logMetacat = Logger.getLogger(ReplicationHandler.class);
   private static int DOCINSERTNUMBER = 1;
   private static int DOCERRORNUMBER  = 1;
@@ -154,7 +154,7 @@
         try
         {
           u = new URL("https://" + server + "?server="
-          +MetaCatUtil.getLocalReplicationServerName()+"&action=update");
+          +MetacatUtil.getLocalReplicationServerName()+"&action=update");
           logMetacat.info("Sending infomation " +u.toString());
           result = MetacatReplication.getURLContent(u);
         }
@@ -298,8 +298,8 @@
       serialNumber=dbConn.getCheckOutSerialNumber();
       //if the document needs to be updated or inserted, this is executed
       String readDocURLString = "https://" + remoteserver + "?server="+
-              MetaCatUtil.getLocalReplicationServerName()+"&action=read&docid="+accNumber;
-      readDocURLString = MetaCatUtil.replaceWhiteSpaceForURL(readDocURLString);
+              MetacatUtil.getLocalReplicationServerName()+"&action=read&docid="+accNumber;
+      readDocURLString = MetacatUtil.replaceWhiteSpaceForURL(readDocURLString);
       URL u = new URL(readDocURLString);
 
       // Get docid content
@@ -316,9 +316,9 @@
       DocInfoHandler dih = new DocInfoHandler();
       XMLReader docinfoParser = initParser(dih);
       String docInfoURLStr = "https://" + remoteserver +
-                       "?server="+MetaCatUtil.getLocalReplicationServerName()+
+                       "?server="+MetacatUtil.getLocalReplicationServerName()+
                        "&action=getdocumentinfo&docid="+accNumber;
-      docInfoURLStr = MetaCatUtil.replaceWhiteSpaceForURL(docInfoURLStr);
+      docInfoURLStr = MetacatUtil.replaceWhiteSpaceForURL(docInfoURLStr);
       URL docinfoUrl = new URL(docInfoURLStr);
       logMetacat.info("Sending message: " +
                                                   docinfoUrl.toString());
@@ -446,9 +446,9 @@
       DocInfoHandler dih = new DocInfoHandler();
       XMLReader docinfoParser = initParser(dih);
       String docInfoURLString = "https://" + remoteserver +
-                  "?server="+MetaCatUtil.getLocalReplicationServerName()+
+                  "?server="+MetacatUtil.getLocalReplicationServerName()+
                   "&action=getdocumentinfo&docid="+accNumber;
-      docInfoURLString = MetaCatUtil.replaceWhiteSpaceForURL(docInfoURLString);
+      docInfoURLString = MetacatUtil.replaceWhiteSpaceForURL(docInfoURLString);
       URL docinfoUrl = new URL(docInfoURLString);
 
       String docInfoStr = MetacatReplication.getURLContent(docinfoUrl);
@@ -473,9 +473,9 @@
       String datafilePath = PropertyService.getProperty("application.datafilepath");
       // Get data file content
       String readDataURLString = "https://" + remoteserver + "?server="+
-                                        MetaCatUtil.getLocalReplicationServerName()+
+                                        MetacatUtil.getLocalReplicationServerName()+
                                             "&action=readdata&docid="+accNumber;
-      readDataURLString = MetaCatUtil.replaceWhiteSpaceForURL(readDataURLString);
+      readDataURLString = MetacatUtil.replaceWhiteSpaceForURL(readDataURLString);
       URL u = new URL(readDataURLString);
       InputStream input = u.openStream();
       //register data file into xml_documents table and wite data file
@@ -625,7 +625,7 @@
       logMetacat.info("Try to update last_check for server: "+server);
       // Get time from remote server
       URL dateurl = new URL("https://" + server + "?server="+
-      MetaCatUtil.getLocalReplicationServerName()+"&action=gettime");
+      MetacatUtil.getLocalReplicationServerName()+"&action=gettime");
       String datexml = MetacatReplication.getURLContent(dateurl);
       logMetacat.info("datexml: "+datexml);
       if (datexml!=null && !datexml.equals(""))
@@ -698,7 +698,7 @@
         server = replServer.getServerName();
         // Try to get catalog
         URL u = new URL("https://" + server + "?server="+
-        MetaCatUtil.getLocalReplicationServerName()+"&action=getcatalog");
+        MetacatUtil.getLocalReplicationServerName()+"&action=getcatalog");
         logMetacat.info("sending message " + u.toString());
         String catxml = MetacatReplication.getURLContent(u);
 
Index: src/edu/ucsb/nceas/metacat/RelationHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/RelationHandler.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/RelationHandler.java	(revision 4698)
@@ -21,7 +21,7 @@
 package edu.ucsb.nceas.metacat;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.morpho.datapackage.Triple;
 import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
@@ -112,10 +112,10 @@
         logMetacat.info("relationship from triple:"+triple.getRelationship());
         logMetacat.info("object from triple: "+triple.getObject());
         //subject = (new DocumentIdentifier(triple.getSubject())).getIdentifier();
-        subject = MetaCatUtil.getDocIdFromString(triple.getSubject());
+        subject = MetacatUtil.getDocIdFromString(triple.getSubject());
         relationship = triple.getRelationship();
         //object = (new DocumentIdentifier(triple.getObject())).getIdentifier();
-        object = MetaCatUtil.getDocIdFromString(triple.getObject());
+        object = MetacatUtil.getDocIdFromString(triple.getObject());
         
         if (subject != null && relationship != null && object != null)
         {
@@ -192,7 +192,7 @@
 		sql.append("' AND (");
 		Vector accessdoctypes;
 		try {
-			accessdoctypes = MetaCatUtil.getOptionList(PropertyService
+			accessdoctypes = MetacatUtil.getOptionList(PropertyService
 				.getProperty("xml.accessdoctype"));
 		} catch (PropertyNotFoundException pnfe) {
 			throw new SQLException("Could not find access doctype: " + pnfe.getMessage());
Index: src/edu/ucsb/nceas/metacat/DBUtil.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DBUtil.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/DBUtil.java	(revision 4698)
@@ -48,7 +48,7 @@
 import org.apache.log4j.Logger;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
@@ -630,7 +630,7 @@
     String docType = null;
     
     // Get docid without rev
-    docIdWithoutRevision = MetaCatUtil.getDocIdFromString(givenDocId);
+    docIdWithoutRevision = MetacatUtil.getDocIdFromString(givenDocId);
     // SQL comand is:
     sqlCommand = "select rev, doctype from xml_documents where docid like ?";
     
@@ -702,7 +702,7 @@
       DBConnection dbConn = null;
       int serialNumber = -1;
       // get rid of rev
-      //docId = MetaCatUtil.getDocIdFromString(docId);
+      //docId = MetacatUtil.getDocIdFromString(docId);
       try {
           //check out DBConnection
           dbConn = DBConnectionPool
Index: src/edu/ucsb/nceas/metacat/ForceReplicationHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/ForceReplicationHandler.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/ForceReplicationHandler.java	(revision 4698)
@@ -40,7 +40,7 @@
 import org.apache.log4j.Logger;
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 /**
  * A class to asyncronously force the replication of each server
@@ -189,7 +189,7 @@
 										+ server);
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicate&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid + "&dbaction=" + action);
 								//over write the url for delete
 								if (action != null && action.equals(DELETE)) {
@@ -197,7 +197,7 @@
 											+ "?action="
 											+ MetacatReplication.FORCEREPLICATEDELETE
 											+ "&docid=" + docid + "&server="
-											+ MetaCatUtil.getLocalReplicationServerName());
+											+ MetacatUtil.getLocalReplicationServerName());
 
 								}
 							}//if servercode==1
@@ -211,7 +211,7 @@
 										+ server);
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicate&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid + "&dbaction=" + action);
 								//over write the url for delete
 								if (action != null && action.equals(DELETE)) {
@@ -219,7 +219,7 @@
 											+ "?action="
 											+ MetacatReplication.FORCEREPLICATEDELETE
 											+ "&docid=" + docid + "&server="
-											+ MetaCatUtil.getLocalReplicationServerName());
+											+ MetacatUtil.getLocalReplicationServerName());
 
 								}
 							}//else
@@ -233,7 +233,7 @@
 										+ server);
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicatedatafile&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid + "&dbaction=" + action);
 								//over write the url for delete
 								if (action != null && action.equals(DELETE)) {
@@ -241,7 +241,7 @@
 											+ "?action="
 											+ MetacatReplication.FORCEREPLICATEDELETE
 											+ "&docid=" + docid + "&server="
-											+ MetaCatUtil.getLocalReplicationServerName());
+											+ MetacatUtil.getLocalReplicationServerName());
 
 								}
 
@@ -256,7 +256,7 @@
 										+ server);
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicatedatafile&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid + "&dbaction=" + action);
 								//over write the url for delete
 								if (action != null && action.equals(DELETE)) {
@@ -264,7 +264,7 @@
 											+ "?action="
 											+ MetacatReplication.FORCEREPLICATEDELETE
 											+ "&docid=" + docid + "&server="
-											+ MetaCatUtil.getLocalReplicationServerName());
+											+ MetacatUtil.getLocalReplicationServerName());
 
 								}
 
@@ -282,7 +282,7 @@
 							if (homeServerCode == 1) {
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicate&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid);
 
 							}//if homeserver ==1
@@ -294,7 +294,7 @@
 								// If the server is homeserver of the docid, replication it too
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicate&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid);
 
 							}//else if
@@ -306,7 +306,7 @@
 							if (homeServerCode == 1) {
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicatedatafile&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid);
 							}//if
 							else if (replicationServer.getHub()
@@ -317,7 +317,7 @@
 								// If the server is homeserver of the docid, replication it too
 								comeAndGetIt = new URL("https://" + server
 										+ "?action=forcereplicatedatafile&server="
-										+ MetaCatUtil.getLocalReplicationServerName()
+										+ MetacatUtil.getLocalReplicationServerName()
 										+ "&docid=" + docid);
 
 							}//else
Index: src/edu/ucsb/nceas/metacat/DBQuery.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DBQuery.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/DBQuery.java	(revision 4698)
@@ -50,7 +50,7 @@
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.util.AuthUtil;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.morpho.datapackage.Triple;
 import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
@@ -394,9 +394,9 @@
          double endHTMLTransform = System.currentTimeMillis()/1000;
           logMetacat.warn("The time to transfrom resultset from xml to html format is "
                   		                             +(endHTMLTransform -startHTMLTransform));
-          MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Transfrom xml to html  "
+          MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Transfrom xml to html  "
                              +(endHTMLTransform -startHTMLTransform));
-          MetaCatUtil.writeDebugToDelimiteredFile(" "+(endHTMLTransform -startHTMLTransform), false);
+          MetacatUtil.writeDebugToDelimiteredFile(" "+(endHTMLTransform -startHTMLTransform), false);
         }
         catch(Exception e)
         {
@@ -650,9 +650,9 @@
       double queryExecuteTime = System.currentTimeMillis() / 1000;
       logMetacat.debug("Time to execute select docid query is "
                     + (queryExecuteTime - startTime));
-      MetaCatUtil.writeDebugToFile("\n\n\n\n\n\nExecute selection query  "
+      MetacatUtil.writeDebugToFile("\n\n\n\n\n\nExecute selection query  "
               + (queryExecuteTime - startTime));
-      MetaCatUtil.writeDebugToDelimiteredFile(""+(queryExecuteTime - startTime), false);
+      MetacatUtil.writeDebugToDelimiteredFile(""+(queryExecuteTime - startTime), false);
 
       boolean tableHasRows = rs.next();
       
@@ -761,9 +761,9 @@
      double docListTime = System.currentTimeMillis() / 1000;
      logMetacat.warn("======Total time to get docid list is: "
                           + (docListTime - startSelectionTime ));
-     MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Total selection: "
+     MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Total selection: "
              + (docListTime - startSelectionTime ));
-     MetaCatUtil.writeDebugToDelimiteredFile(" "+ (docListTime - startSelectionTime ), false);
+     MetacatUtil.writeDebugToDelimiteredFile(" "+ (docListTime - startSelectionTime ), false);
      //if docListResult is not empty, it need to be sent.
      if (docListResult.size() != 0)
      {
@@ -841,9 +841,9 @@
      double endGetReturnValueFromQueryresultable = System.currentTimeMillis()/1000;
      logMetacat.warn("Time to get return fields from xml_queryresult table is (Part1 in return fields) " +
           		               (endGetReturnValueFromQueryresultable-startGetReturnValueFromQueryresultable));
-     MetaCatUtil.writeDebugToFile("-----------------------------------------Get fields from xml_queryresult(Part1 in return fields) " +
+     MetacatUtil.writeDebugToFile("-----------------------------------------Get fields from xml_queryresult(Part1 in return fields) " +
                (endGetReturnValueFromQueryresultable-startGetReturnValueFromQueryresultable));
-     MetaCatUtil.writeDebugToDelimiteredFile(" " +
+     MetacatUtil.writeDebugToDelimiteredFile(" " +
              (endGetReturnValueFromQueryresultable-startGetReturnValueFromQueryresultable),false);
      // backup the keys-elements in partOfDoclist to check later
      // if the doc entry is indexed yet
@@ -864,9 +864,9 @@
      double endExtendedQuery = System.currentTimeMillis()/1000;
      logMetacat.warn("Get fields from index and node table (Part2 in return fields) "
         		                                          + (endExtendedQuery - endGetReturnValueFromQueryresultable));
-     MetaCatUtil.writeDebugToFile("-----------------------------------------Get fields from extened query(Part2 in return fields) "
+     MetacatUtil.writeDebugToFile("-----------------------------------------Get fields from extened query(Part2 in return fields) "
              + (endExtendedQuery - endGetReturnValueFromQueryresultable));
-     MetaCatUtil.writeDebugToDelimiteredFile(" "
+     MetacatUtil.writeDebugToDelimiteredFile(" "
              + (endExtendedQuery - endGetReturnValueFromQueryresultable), false);
      //add relationship part part docid list for the documents in partOfDocList
      //partOfDoclist = addRelationship(partOfDoclist, qspec, dbconn, useXMLIndex);
@@ -928,9 +928,9 @@
      double endStoreReturnField = System.currentTimeMillis()/1000;
      logMetacat.warn("Time to store new return fields into xml_queryresult table (Part4 in return fields) "
                    + (endStoreReturnField -startStoreReturnField));
-     MetaCatUtil.writeDebugToFile("-----------------------------------------Insert new record to xml_queryresult(Part4 in return fields) "
+     MetacatUtil.writeDebugToFile("-----------------------------------------Insert new record to xml_queryresult(Part4 in return fields) "
              + (endStoreReturnField -startStoreReturnField));
-     MetaCatUtil.writeDebugToDelimiteredFile(" "
+     MetacatUtil.writeDebugToDelimiteredFile(" "
              + (endStoreReturnField -startStoreReturnField), false);
      
      Enumeration keysE = queryresultDocList.keys();
@@ -950,10 +950,10 @@
      double returnFieldTime = System.currentTimeMillis() / 1000;
      logMetacat.warn("======Total time to get return fields is: "
                            + (returnFieldTime - startReturnField));
-     MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------"+
+     MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------"+
     		 "Total to get return fields  "
                                    + (returnFieldTime - startReturnField));
-     MetaCatUtil.writeDebugToDelimiteredFile(" "+ (returnFieldTime - startReturnField), false);
+     MetacatUtil.writeDebugToDelimiteredFile(" "+ (returnFieldTime - startReturnField), false);
      return resultset;
  }
 
@@ -1170,10 +1170,10 @@
                logMetacat.warn(
                    "Time to execute extended query: "
                    + (extendedQueryEnd - extendedQueryStart));
-               MetaCatUtil.writeDebugToFile(
+               MetacatUtil.writeDebugToFile(
                        "Execute extended query "
                        + (extendedQueryEnd - extendedQueryStart));
-               MetaCatUtil.writeDebugToDelimiteredFile(" "+ (extendedQueryEnd - extendedQueryStart), false);
+               MetacatUtil.writeDebugToDelimiteredFile(" "+ (extendedQueryEnd - extendedQueryStart), false);
                tableHasRows = rs.next();
                while (tableHasRows) {
                    ReturnFieldValue returnValue = new ReturnFieldValue();
@@ -1180,7 +1180,7 @@
                    docid = rs.getString(1).trim();
                    fieldname = rs.getString(2);
                    fielddata = rs.getString(3);
-                   fielddata = MetaCatUtil.normalize(fielddata);
+                   fielddata = MetacatUtil.normalize(fielddata);
                    String parentId = rs.getString(4);
                    fieldtype = rs.getString(5);
                    StringBuffer value = new StringBuffer();
@@ -2210,9 +2210,9 @@
         String docId = null;
         int version = -5;
         // Docid without revision
-        docId = MetaCatUtil.getDocIdFromString(docIdString);
+        docId = MetacatUtil.getDocIdFromString(docIdString);
         // revision number
-        version = MetaCatUtil.getVersionFromString(docIdString);
+        version = MetacatUtil.getVersionFromString(docIdString);
 
         //check if the reqused docId is a data package id
         if (!isDataPackageId(docId)) {
@@ -2314,12 +2314,12 @@
                     String documentId = (String) documentImplList.elementAt(i);
                     logMetacat.info("docid: " + documentId);
                     // Get doicd without revision
-                    String docidWithoutRevision = MetaCatUtil
+                    String docidWithoutRevision = MetacatUtil
                             .getDocIdFromString(documentId);
                     logMetacat.info("docidWithoutRevsion: "
                             + docidWithoutRevision);
                     // Get revision
-                    String revision = MetaCatUtil
+                    String revision = MetacatUtil
                             .getRevisionStringFromString(documentId);
                     logMetacat.info("revsion from docIdentifier: "
                             + revision);
Index: src/edu/ucsb/nceas/metacat/AccessControlForSingleFile.java
===================================================================
--- src/edu/ucsb/nceas/metacat/AccessControlForSingleFile.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/AccessControlForSingleFile.java	(revision 4698)
@@ -36,7 +36,7 @@
 import java.net.MalformedURLException;
 import org.apache.log4j.Logger;
 
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 
 /** 
@@ -75,7 +75,7 @@
     try
     {
       //Get rid of dev if myaccessNumber has one;
-      docId = MetaCatUtil.getDocIdFromString(myAccessionNumber);
+      docId = MetacatUtil.getDocIdFromString(myAccessionNumber);
       if (docId == null || docId.equals(""))
       {
         throw new Exception("Docid couldn't be null");
Index: src/edu/ucsb/nceas/metacat/DBTransform.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DBTransform.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/DBTransform.java	(revision 4698)
@@ -73,7 +73,7 @@
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.service.SkinPropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 import edu.ucsb.nceas.utilities.SortedProperties;
@@ -87,7 +87,7 @@
 public class DBTransform {
 
   //private Connection	conn = null;
-  private MetaCatUtil   util = null;
+  private MetacatUtil   util = null;
   private String 	configDir = null;
   private String	defaultStyle = null;
   private Logger logMetacat = Logger.getLogger(DBTransform.class);
Index: src/edu/ucsb/nceas/metacat/EML201DocumentCorrector.java
===================================================================
--- src/edu/ucsb/nceas/metacat/EML201DocumentCorrector.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/EML201DocumentCorrector.java	(revision 4698)
@@ -123,7 +123,7 @@
      {
     	 
     	 //initialize options and connection pool
-    	 PropertyService.getInstance("build/metacat.properties");
+    	 PropertyService.getInstance();
     	 DBConnectionPool connPool = DBConnectionPool.getInstance();
     	   	 
     	 // run the thread
Index: src/edu/ucsb/nceas/metacat/QueryGroup.java
===================================================================
--- src/edu/ucsb/nceas/metacat/QueryGroup.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/QueryGroup.java	(revision 4698)
@@ -30,7 +30,7 @@
 package edu.ucsb.nceas.metacat;
 
 import edu.ucsb.nceas.dbadapter.*;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 import java.io.*;
 import java.util.Hashtable;
@@ -330,7 +330,7 @@
     		//System.out.println("new term is not null branch in handle new query term");
     		//we only handle union operator now.
     		if (operator != null && operator.equalsIgnoreCase(UNION) && 
-    				MetaCatUtil.pathsForIndexing.contains(newTerm.getPathExpression()))
+    				MetacatUtil.pathsForIndexing.contains(newTerm.getPathExpression()))
     	    {
     			//System.out.println("in only union branch in handle new query term");
 	    		for (int i=0; i<queryTermsInPathIndex.size(); i++)
Index: src/edu/ucsb/nceas/metacat/QueryTerm.java
===================================================================
--- src/edu/ucsb/nceas/metacat/QueryTerm.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/QueryTerm.java	(revision 4698)
@@ -32,7 +32,7 @@
 import java.util.Vector;
 import org.apache.log4j.Logger;
 
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 
 /** a utility class that represents a single term in a query */
 public class QueryTerm
@@ -224,7 +224,7 @@
 
         // if pathexpr has been specified in metacat.properties for indexing
         if(pathexpr != null){
-            if(MetaCatUtil.pathsForIndexing.contains(pathexpr)){
+            if(MetacatUtil.pathsForIndexing.contains(pathexpr)){
                 usePathIndex = true;
             }
         }
Index: src/edu/ucsb/nceas/metacat/DBSAXHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DBSAXHandler.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/DBSAXHandler.java	(revision 4698)
@@ -37,7 +37,7 @@
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.service.XMLSchema;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.morpho.datapackage.Triple;
 import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
@@ -239,7 +239,7 @@
 		try {
 			// if it is data package insert triple into relation table;
 			if (doctype != null
-					&& MetaCatUtil.getOptionList(
+					&& MetacatUtil.getOptionList(
 							PropertyService.getProperty("xml.packagedoctype")).contains(
 							doctype) && hasTriple && !isRevisionDoc) {
 
@@ -448,7 +448,7 @@
 		// start parsing triple
 		try {
 			if (doctype != null
-					&& MetaCatUtil.getOptionList(
+					&& MetacatUtil.getOptionList(
 							PropertyService.getProperty("xml.packagedoctype")).contains(doctype)
 					&& localName.equals("triple")) {
 				startParseTriple = true;
@@ -808,7 +808,7 @@
 
         String normalizedData = strBuffer.toString();
         logMetacat.debug("Before normalize in write process === "+normalizedData);
-        String afterNormalize = MetaCatUtil.normalize(normalizedData);
+        String afterNormalize = MetacatUtil.normalize(normalizedData);
         logMetacat.debug("After normalize in write process === "+afterNormalize);
         strBuffer = new StringBuffer(afterNormalize);;
 
Index: src/edu/ucsb/nceas/metacat/Eml200SAXHandler.java
===================================================================
--- src/edu/ucsb/nceas/metacat/Eml200SAXHandler.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/Eml200SAXHandler.java	(revision 4698)
@@ -50,7 +50,7 @@
 
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.util.AuthUtil;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
 /**
@@ -597,7 +597,7 @@
                 //intitialize namespace hash for in line data
                 inlineDataNameSpace = new Hashtable();
                 //initialize file writer
-                String docidWithoutRev = MetaCatUtil.getDocIdFromString(docid);
+                String docidWithoutRev = MetacatUtil.getDocIdFromString(docid);
                 String seperator = ".";
                 try {
 					seperator = PropertyService.getProperty("document.accNumSeparator");
@@ -652,7 +652,7 @@
                         && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
                     // stored the pull out nodes into storedNode stack
                     NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
-                            null, null, MetaCatUtil.normalize(textBuffer
+                            null, null, MetacatUtil.normalize(textBuffer
                                     .toString()));
                     storedAccessNodeStack.push(nodeElement);
 
@@ -918,13 +918,13 @@
             {
                 // stored the pull out nodes into storedNode stack
                 NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "ELEMENT",
-                        localName, prefix, MetaCatUtil.normalize(null));
+                        localName, prefix, MetacatUtil.normalize(null));
                 storedAccessNodeStack.push(nodeElement);
                 for (int i = 0; i < atts.getLength(); i++) {
                     String attributeName = atts.getQName(i);
                     String attributeValue = atts.getValue(i);
                     NodeRecord nodeAttribute = new NodeRecord(-2, -2, -2,
-                            "ATTRIBUTE", attributeName, null, MetaCatUtil
+                            "ATTRIBUTE", attributeName, null, MetacatUtil
                                     .normalize(attributeValue));
                     storedAccessNodeStack.push(nodeAttribute);
                 }
@@ -944,7 +944,7 @@
               // we started process additional access rules here
               // because access and describe couldn't be seperated
               NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "ELEMENT",
-                        localName, prefix, MetaCatUtil.normalize(null));
+                        localName, prefix, MetacatUtil.normalize(null));
               storedAccessNodeStack.push(nodeElement);
               processAdditionalAccess = true;
               logMetacat.warn("set processAdditonalAccess ture when meet describe");
@@ -1053,7 +1053,7 @@
                 {
                      // stored the pull out nodes into storedNode stack
                      NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
-                       null, null, MetaCatUtil.normalize(textBuffer
+                       null, null, MetacatUtil.normalize(textBuffer
                           .toString()));
                      storedAccessNodeStack.push(nodeElement);
 
@@ -1283,7 +1283,7 @@
                         && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
                     // stored the pull out nodes into storedNode stack
                     NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
-                            null, null, MetaCatUtil.normalize(textBuffer
+                            null, null, MetacatUtil.normalize(textBuffer
                                     .toString()));
                     storedAccessNodeStack.push(nodeElement);
 
@@ -1542,7 +1542,7 @@
                         && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
                     // stored the pull out nodes into storedNode stack
                     NodeRecord nodeElement = new NodeRecord(-2, -2, -2,
-                            "COMMENT", null, null, MetaCatUtil.normalize(str));
+                            "COMMENT", null, null, MetacatUtil.normalize(str));
                     storedAccessNodeStack.push(nodeElement);
 
                 }
@@ -1649,7 +1649,7 @@
                         && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
                     // stored the pull out nodes into storedNode stack
                     NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
-                            null, null, MetaCatUtil.normalize(data));
+                            null, null, MetacatUtil.normalize(data));
                     storedAccessNodeStack.push(nodeElement);
 
                 }
@@ -2092,7 +2092,7 @@
         throw new SAXException("The access object is null");
       }
        // get rid of rev from dataId
-       //dataId = MetaCatUtil.getDocIdFromString(dataId);
+       //dataId = MetacatUtil.getDocIdFromString(dataId);
        //String permOrder = accessSection.getPermissionOrder();
        String sql = null;
        PreparedStatement pstmt = null;
@@ -2657,12 +2657,12 @@
       String docid = null;
       // if the url is not a ecogrid protocol, null will be getten
       String accessionNumber =
-                 MetaCatUtil.getAccessionNumberFromEcogridIdentifier(url);
+                 MetacatUtil.getAccessionNumberFromEcogridIdentifier(url);
       if (accessionNumber != null)
       {
         // handle ecogrid protocol
         // get rid of revision number to get the docid.
-        docid = MetaCatUtil.getDocIdFromAccessionNumber(accessionNumber);
+        docid = MetacatUtil.getDocIdFromAccessionNumber(accessionNumber);
         onlineDataFileIdInRelationVector.add(docid);
         try
         {
Index: src/edu/ucsb/nceas/metacat/SchemaLocationResolver.java
===================================================================
--- src/edu/ucsb/nceas/metacat/SchemaLocationResolver.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/SchemaLocationResolver.java	(revision 4698)
@@ -38,6 +38,7 @@
 
 import org.apache.log4j.Logger;
 
+import edu.ucsb.nceas.metacat.service.ServiceService;
 import edu.ucsb.nceas.metacat.service.XMLSchemaService;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 
@@ -104,7 +105,7 @@
         InputStream in = DBEntityResolver.checkURLConnection(schemaLocation);
        
         String newURLInMetacat = uploadSchemaFromURL(in);
-        XMLSchemaService.getInstance().refresh();
+        ServiceService.refreshService("XMLSchemaService");
        
         // check the name space list again.  It may not have appeared the first time 
         // because the schema was in the db but there was no file on disk.  If that's 
@@ -112,7 +113,7 @@
         // to register the schema in the database.
         if (!XMLSchemaService.getNameSpaceList().contains(nameSpace)) {
         	registerSchema(newURLInMetacat);
-        	XMLSchemaService.getInstance().refresh();
+        	ServiceService.refreshService("XMLSchemaService");
         }
         downloadNewSchema = true;
      
Index: src/edu/ucsb/nceas/metacat/AccessControlList.java
===================================================================
--- src/edu/ucsb/nceas/metacat/AccessControlList.java	(revision 4697)
+++ src/edu/ucsb/nceas/metacat/AccessControlList.java	(revision 4698)
@@ -49,7 +49,7 @@
 
 import edu.ucsb.nceas.metacat.service.DatabaseService;
 import edu.ucsb.nceas.metacat.service.PropertyService;
-import edu.ucsb.nceas.metacat.util.MetaCatUtil;
+import edu.ucsb.nceas.metacat.util.MetacatUtil;
 import edu.ucsb.nceas.metacat.util.SystemUtil;
 import edu.ucsb.nceas.utilities.PropertyNotFoundException;
 
@@ -341,7 +341,7 @@
             //docid = docID.getIdentifier();
             // the docid get here has revision number, so we need to 
             // remove it.
-            //docid = MetaCatUtil.getDocIdFromAccessionNumber(docid);
+            //docid = MetacatUtil.getDocIdFromAccessionNumber(docid);
             //System.out.println("The docid insert is!!!!!!!!!! "+ docid);
             insertPermissions(docid,leavingTagName);
           }
@@ -708,7 +708,7 @@
       serialNumber=conn.getCheckOutSerialNumber();
       
       isOwned = isOwned(docid, user);
-      systemID = getSystemID((String)MetaCatUtil.
+      systemID = getSystemID((String)MetacatUtil.
                                       getOptionList(accDoctype).elementAt(0));
       publicAcc = getPublicAccess(docid);
         
