From: Laramie Crocker <laramie@berkeley.edu>
Date: Fri, 20 May 2011 11:07:25 +0000 (+0000)
Subject: CSPACE-4027 removed the pesky dev-master.xml so inadvertant checkins can not happen... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=05743a02507fc699d6f2ff6de2073a2664f55bfb;p=tmp%2Fjakarta-migration.git

CSPACE-4027 removed the pesky dev-master.xml so inadvertant checkins can not happen, and modified XmlReplayDevTest to quit nicely if not dev-master.mxl not found. Also moved common prettyPrint code into common.XmlTools.  Added XmlReplayReport and supporting files to spit out friendly html version of test results.
---

diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java
index 463cf0437..15e224137 100755
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java
@@ -4,7 +4,9 @@ import org.apache.commons.cli.*;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.jexl2.JexlEngine;
+import org.collectionspace.services.common.api.FileTools;
 import org.collectionspace.services.common.api.Tools;
+import org.collectionspace.services.common.service.ServiceBindingType;
 import org.dom4j.*;
 import org.dom4j.io.SAXReader;
 
@@ -21,6 +23,7 @@ public class XmlReplay {
     public XmlReplay(String basedir){
         this.basedir = basedir;
         this.serviceResultsMap = createResultsMap();
+        this.reportsList = new ArrayList<String>();
     }
 
     public static final String DEFAULT_CONTROL = "xml-replay-control.xml";
@@ -80,6 +83,10 @@ public class XmlReplay {
         return new HashMap<String, ServiceResult>();
     }
 
+    private List<String> reportsList;
+    public  List<String> getReportsList(){
+        return reportsList;
+    }
 
     public String toString(){
         return "XmlReplay{"+this.basedir+", "+this.defaultAuthsMap+", "+this.dump+'}';
@@ -87,8 +94,30 @@ public class XmlReplay {
 
     // ============== METHODS ===========================================================
 
+    /** Optional information method: call this method after instantiating this class using the constructor XmlReplay(String), which sets the basedir.  Then you
+     *   pass in your relative masterFilename to that basedir to this method, which will return true if the file is readable, valid xml, etc.
+     *   Do this in preference to  just seeing if File.exists(), because there are rules to finding the file relative to the maven test dir, yada, yada.
+     *   This method makes it easy to have a development test file that you don't check in, so that dev tests can be missing gracefully, etc.
+     */
+    public boolean masterConfigFileExists(String masterFilename){
+        try {
+            org.dom4j.Document doc = openMasterConfigFile(masterFilename);
+            if (doc == null){
+                return false;
+            }
+            return true;
+        } catch (Throwable t){
+            return false;
+        }
+    }
+
     public org.dom4j.Document openMasterConfigFile(String masterFilename) throws FileNotFoundException {
-        org.dom4j.Document document = getDocument(Tools.glue(basedir, "/", masterFilename)); //will check full path first, then checks relative to PWD.
+        String fullPath = Tools.glue(basedir, "/", masterFilename);
+        File f = new File(fullPath);
+        if (!f.exists()){
+            return null;
+        }
+        org.dom4j.Document document = getDocument(fullPath); //will check full path first, then checks relative to PWD.
         if (document == null){
             throw new FileNotFoundException("XmlReplay master control file ("+masterFilename+") not found in basedir: "+basedir+". Exiting test.");
         }
@@ -100,6 +129,9 @@ public class XmlReplay {
      */
     public org.dom4j.Document readOptionsFromMasterConfigFile(String masterFilename) throws FileNotFoundException {
         org.dom4j.Document document = openMasterConfigFile(masterFilename);
+        if (document == null){
+            throw new FileNotFoundException(masterFilename);
+        }
         protoHostPort = document.selectSingleNode("/xmlReplayMaster/protoHostPort").getText().trim();
         AuthsMap authsMap = readAuths(document);
         setDefaultAuthsMap(authsMap);
@@ -122,6 +154,9 @@ public class XmlReplay {
         } else {
             document = openMasterConfigFile(masterFilename);
         }
+        if (document==null){
+            throw new FileNotFoundException(masterFilename);
+        }
         String controlFile, testGroup, test;
         List<Node> runNodes;
         runNodes = document.selectNodes("/xmlReplayMaster/run");
@@ -141,7 +176,16 @@ public class XmlReplay {
             //Now run *that* instance.
             List<ServiceResult> results = replay.runTests(testGroup, test);
             list.add(results);
+            this.reportsList.addAll(replay.getReportsList());   //Add all the reports from the inner replay, to our master replay's reportsList, to generate the index.html file.
         }
+        StringBuffer sb = new StringBuffer(XmlReplayReport.HTML_PAGE_START);
+        String dateStr = Tools.nowLocale();
+        sb.append("<div class='REPORTTIME'>XmlReplay run  "+dateStr+" master: "+masterFilename+"</div>");
+        for (String oneToc: this.reportsList){
+            sb.append(oneToc).append("<hr />");
+        }
+        sb.append(XmlReplayReport.HTML_PAGE_END);
+        FileTools.saveFile(getReportsDir(this.basedir),"index."+masterFilename+".html", sb.toString(), false);
         return list;
     }
 
@@ -155,7 +199,8 @@ public class XmlReplay {
                                 this.autoDeletePOSTS,
                                 dump,
                                 this.protoHostPort,
-                                this.defaultAuthsMap);
+                                this.defaultAuthsMap,
+                                this.reportsList);
         return result;
     }
 
@@ -169,7 +214,8 @@ public class XmlReplay {
                                 this.autoDeletePOSTS,
                                 dump,
                                 this.protoHostPort,
-                                this.defaultAuthsMap);
+                                this.defaultAuthsMap,
+                                this.reportsList);
         if (result.size()>1){
             throw new IndexOutOfBoundsException("Multiple ("+result.size()+") tests with ID='"+testID+"' were found within test group '"+testGroupID+"', but there should only be one test per ID attribute.");
         }
@@ -352,7 +398,7 @@ public class XmlReplay {
             document = reader.read(xmlFileName);
         } catch (DocumentException e) {
             System.out.println("ERROR reading document: "+e);
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return document;
     }
@@ -417,13 +463,16 @@ public class XmlReplay {
                                           boolean param_autoDeletePOSTS,
                                           Dump dump,
                                           String protoHostPortParam,
-                                          AuthsMap defaultAuths)
+                                          AuthsMap defaultAuths,
+                                          List<String> reportsList)
                                           throws Exception {
         //Internally, we maintain two collections of ServiceResult:
         //  the first is the return value of this method.
         //  the second is the serviceResultsMap, which is used for keeping track of CSIDs created by POSTs, for later reference by DELETE, etc.
         List<ServiceResult> results = new ArrayList<ServiceResult>();
 
+        XmlReplayReport report = new XmlReplayReport();
+
         String controlFile = Tools.glue(xmlReplayBaseDir, "/", controlFileName);
         org.dom4j.Document document;
         document = getDocument(controlFile); //will check full path first, then checks relative to PWD.
@@ -449,7 +498,9 @@ public class XmlReplay {
         } else {
             authsMapINFO = "Using AuthsMap from control file: "+authsMap;
         }
-        System.out.println("========================================================================"
+
+        report.addTestGroup(testGroupID, controlFileName);   //controlFileName is just the short name, without the full path.
+        String xmlReplayHeader = "========================================================================"
                           +"\r\nXmlReplay running:"
                           +"\r\n   controlFile: "+ (new File(controlFile).getCanonicalPath())
                           +"\r\n   protoHostPort: "+protoHostPort
@@ -459,7 +510,10 @@ public class XmlReplay {
                           +"\r\n   param_autoDeletePOSTS: "+param_autoDeletePOSTS
                           +"\r\n   Dump info: "+dump
                           +"\r\n========================================================================"
-                          +"\r\n");
+                          +"\r\n";
+        report.addRunInfo(xmlReplayHeader);
+
+        System.out.println(xmlReplayHeader);
 
         String autoDeletePOSTS = "";
         List<Node> testgroupNodes;
@@ -631,6 +685,8 @@ public class XmlReplay {
                     String serviceResultRow = serviceResult.dump(dump.dumpServiceResult, hasError)+"; time:"+(System.currentTimeMillis()-startTime);
                     String leader = (dump.dumpServiceResult == ServiceResult.DUMP_OPTIONS.detailed) ? "XmlReplay:"+testIDLabel+": ": "";
 
+                    report.addTestResult(serviceResult);
+
                     if (   (dump.dumpServiceResult == ServiceResult.DUMP_OPTIONS.detailed)
                         || (dump.dumpServiceResult == ServiceResult.DUMP_OPTIONS.full)         ){
                         System.out.println("\r\n#---------------------#");
@@ -664,9 +720,28 @@ public class XmlReplay {
                 autoDelete(serviceResultsMap, "default");
             }
         }
+
+        //=== Now spit out the HTML report file ===
+        File m = new File(controlFileName);
+        String localName = m.getName();//don't instantiate, just use File to extract file name without directory.
+        String reportName = localName+'-'+testGroupID+".html";
+        File resultFile = FileTools.saveFile(getReportsDir(xmlReplayBaseDir), reportName, report.getPage(), true);
+        if (resultFile!=null) {
+            System.out.println("XmlReplay summary reports saved to directory: "+resultFile.getParent());
+            System.out.println("XmlReplay summary report: "+resultFile.getCanonicalPath());
+            String toc = report.getTOC(reportName);
+            reportsList.add(toc);
+        }
+        //================================
+
         return results;
     }
 
+    //todo: move from xmlReplayBaseDir to "target/xmlReplayReports" dir.
+    public static String getReportsDir(String basename){
+        return Tools.glue(basename,"/","TEST-REPORTS");
+    }
+
     //======================== MAIN ===================================================================
 
     private static Options createOptions() {
@@ -775,7 +850,9 @@ public class XmlReplay {
             } else {
                 Dump dump = getDumpConfig();
                 dump.payloads = Tools.isTrue(dumpResults);
-                runXmlReplayFile(xmlReplayBaseDirResolved, controlFilename, testGroupID, testID, createResultsMap(), bAutoDeletePOSTS, dump, "", null);
+                List<String> reportsList = new ArrayList<String>();
+                runXmlReplayFile(xmlReplayBaseDirResolved, controlFilename, testGroupID, testID, createResultsMap(), bAutoDeletePOSTS, dump, "", null, reportsList);
+                System.out.println("DEPRECATED: reportsList is generated, but not dumped: "+reportsList.toString());
             }
         } catch (ParseException exp) {
             // oops, something went wrong
diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayReport.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayReport.java
new file mode 100644
index 000000000..4783b049c
--- /dev/null
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayReport.java
@@ -0,0 +1,207 @@
+package org.collectionspace.services.IntegrationTests.xmlreplay;
+
+import org.collectionspace.services.common.XmlTools;
+import org.collectionspace.services.common.api.Tools;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**  Format a report based on XmlReplay ServiceResult object from a test group.
+ * @author  laramie
+ */
+public class XmlReplayReport {
+    public static final String HTML_PAGE_START = "<html><head><script type='text/javascript' src='reports-include.js'></script>"
+                                                                         +"<LINK rel='stylesheet' href='reports-include.css'></LINK></head><body>";
+    protected static final String HTML_PAGE_END = "</body></html>";
+    protected static final String TOPLINKS = "<a class='TOPLINKS' href='javascript:openAll();'>Show All Payloads</a>" + "<a class='TOPLINKS' href='javascript:closeAll();'>Hide All Payloads</a>";
+
+    protected static final String HTML_TEST_START = "<div class='TESTCASE'>";
+    protected static final String HTML_TEST_END = "</div>";
+
+    protected static final String GROUP_START = "<div class='TESTGROUP'>";
+    protected static final String GROUP_END = "</div>";
+
+    protected static final String RUNINFO_START = "<div class='RUNINFO'>";
+    protected static final String RUNINFO_END = "</div>";
+
+
+    protected static final String DIV_END = "</div>";
+
+    protected static final String PRE_START = "<pre class='SUMMARY'>";
+    protected static final String PRE_END = "</pre>";
+    protected static final String BR = "<br />\r\n";
+
+    protected static final String DETAIL_START = "<table border='1' class='DETAIL_TABLE'><tr><td>\r\n";
+    protected static final String DETAIL_LINESEP = "</td></tr>\r\n<tr><td>";
+    protected static final String DETAIL_END = "</td></tr></table>";
+
+    private static final String SP = "&nbsp;&nbsp;&nbsp;";
+
+
+    protected static String formatCollapse(String myDivID, String linkText){
+        return  "<a href='javascript:;' onmousedown=\"toggleDiv('"+myDivID+"');\">"+linkText+"</a>"
+                 + BR
+                 + "<div ID='"+myDivID+"' class='PAYLOAD' style='display:none'>";
+    }
+
+
+    private StringBuffer header = new StringBuffer();
+    private StringBuffer buffer = new StringBuffer();
+    private String runInfo = "";
+    //private StringBuffer toc = new StringBuffer();
+
+    public String getPage(){
+        return    HTML_PAGE_START
+                    +"<div class='REPORTTIME'>XmlReplay run  "+Tools.nowLocale()+"</div>"
+                    +header.toString()
+                    +this.runInfo
+                    +BR
+                    +getTOC("").toString()
+                    +BR
+                    +buffer.toString()
+                    +HTML_PAGE_END;
+    }
+
+    public String getTOC(String reportName){
+        StringBuffer tocBuffer = new StringBuffer();
+
+        if (Tools.notBlank(reportName)){
+            // We are generating an index.html file.
+            tocBuffer.append(this.header.toString());
+        }
+        tocBuffer.append(BR).append(TOPLINKS).append(BR);
+        for (TOC toc: tocList){
+              tocBuffer.append(BR+"<a href='"+reportName+"#TOC"+toc.tocID+"'>"+toc.testID+"</a> "+ toc.detail);
+        }
+        tocBuffer.append(BR+BR);
+        return tocBuffer.toString();
+    }
+
+    public void addRunInfo(String text){
+         this.runInfo = RUNINFO_START+text+RUNINFO_END;
+         //addText(this.runInfo);
+    }
+
+
+    public void addText(String text){
+         buffer.append(text);
+    }
+    public void addTestGroup(String groupID, String controlFile){
+        header.append(GROUP_START);
+        header.append(lbl("Test Group")).append(groupID).append(SP).append(lbl("Control File")).append(controlFile);
+        header.append(GROUP_END);
+    }
+
+    private int divID = 0;
+
+    public void addTestResult(ServiceResult serviceResult){
+        buffer.append(HTML_TEST_START);
+        int tocID = ++divID;
+        buffer.append(formatSummary(serviceResult, tocID));
+        buffer.append(formatPayloads(serviceResult, tocID));
+        buffer.append(HTML_TEST_END);
+    }
+
+    public static class TOC {
+        public int tocID;
+        public String testID;
+        public String detail;
+    }
+    private List<TOC> tocList = new ArrayList<TOC>();
+
+    protected String formatSummary(ServiceResult serviceResult, int tocID){
+        TOC toc = new TOC();
+        toc.tocID = tocID;
+        toc.testID = serviceResult.testID;
+        toc.detail =  (serviceResult.gotExpectedResult() ? ok("SUCCESS") : red("FAILURE") );
+        tocList.add(toc);
+
+        StringBuffer fb = new StringBuffer();
+        fb.append("<a name='TOC"+tocID+"'></a>");
+        fb.append(detail(serviceResult, false, false, DETAIL_START, DETAIL_LINESEP, DETAIL_END, tocID));
+        return fb.toString();
+    }
+
+    protected String formatPayloads(ServiceResult serviceResult, int tocID){
+        StringBuffer fb = new StringBuffer();
+        fb.append(BR);
+        appendPayload(fb, serviceResult.requestPayload, "REQUEST", "REQUEST" + tocID);
+        appendPayload(fb, serviceResult.requestPayloadsRaw, "REQUEST (RAW)", "REQUESTRAW" + tocID);
+        appendPayload(fb, serviceResult.result, "RESPONSE", "RESPONSE" + tocID);
+        fb.append(BR);
+
+        return fb.toString();
+    }
+
+    protected void appendPayload( StringBuffer fb , String payload, String title, String theDivID){
+        if (Tools.notBlank(payload)){
+            //fb.append(BR+title+":"+BR);
+            try {
+                String pretty = prettyPrint(payload);
+
+
+                fb.append(formatCollapse(theDivID, title));  //starts a div.
+                fb.append(PRE_START);
+                fb.append(escape(pretty));
+                fb.append(PRE_END);
+                fb.append(DIV_END);                        //ends that div.
+            } catch (Exception e){
+                String error = "<font color='red'>ERROR:</font> "+payload;
+                fb.append(error);
+                fb.append(BR).append(BR);
+            }
+        }
+    }
+
+    private String escape(String source){
+        try {
+            return Tools.searchAndReplace(source, "<", "&lt;");
+        } catch (Exception e){
+            return "ERROR escaping requestPayload"+e;
+        }
+    }
+
+    private String prettyPrint(String rawXml) throws Exception {
+        Document document = DocumentHelper.parseText(rawXml);
+        return XmlTools.prettyPrint(document, "    ");
+    }
+
+    private static final String LINE = "<hr />\r\n";
+    private static final String CRLF = "<br />\r\n";
+
+    protected String red(String label){
+        return "<span class='ERROR'>"+label+"</span> ";
+    }
+    protected String ok(String label){
+        return "<span class='OK'>"+label+"</span> ";
+    }
+    protected String lbl(String label){
+        return "<span class='LABEL'>"+label+":</span> ";
+    }
+    public String detail(ServiceResult s, boolean includePayloads, boolean includePartSummary, String start, String linesep, String end, int tocID){
+        String partSummary = s.partsSummary(includePartSummary);
+        String res =  start
+                + ( s.gotExpectedResult() ? lbl("SUCCESS") : "<font color='red'><b>FAILURE</b></font>"  )
+                  + SP + ( Tools.notEmpty(s.testID) ? s.testID : "" )
+                  + SP +linesep
+                +s.method+ SP +"<a href='"+s.fullURL+"'>"+s.fullURL+"</a>"                                     +linesep
+                + s.responseCode+ SP +lbl("gotExpected")+s.gotExpectedResult()                                                       +linesep
+                + (Tools.notBlank(s.failureReason) ? s.failureReason +linesep : "" )
+                + ( (s.expectedCodes.size()>0) ? lbl("expectedCodes")+s.expectedCodes+linesep : "" )
+                //+ ( Tools.notEmpty(s.testGroupID) ? "testGroupID:"+s.testGroupID+linesep : "" )
+                //THIS WORKS, BUT IS VERBOSE: + ( Tools.notEmpty(s.fromTestID) ? "fromTestID:"+s.fromTestID+linesep : "" )
+                + ( Tools.notEmpty(s.responseMessage) ? lbl("msg")+s.responseMessage+linesep : "" )
+                +lbl("auth")+s.auth                                                                                        +linesep
+                + ( Tools.notEmpty(s.deleteURL) ? lbl("deleteURL")+s.deleteURL+linesep : "" )
+                + ( Tools.notEmpty(s.location) ? lbl("location.CSID")+s.location+linesep : "" )
+                + ( Tools.notEmpty(s.error) ? "ERROR:"+s.error +linesep : "" )
+                + ((includePartSummary && Tools.notBlank(partSummary)) ? lbl("part summary")+partSummary +linesep : "")
+                + ( includePayloads && Tools.notBlank(s.requestPayload) ? LINE+lbl("requestPayload")+LINE+CRLF+s.requestPayload+LINE : "" )
+                + ( includePayloads && Tools.notBlank(s.result) ? LINE+lbl("result")+LINE+CRLF+s.result : "" )
+                +end;
+        return res;
+    }
+
+}
diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java
index 292e2d9b6..58ec12861 100755
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java
@@ -184,9 +184,9 @@ public class XmlReplayTransport {
     throws Exception {
         byte[] b = FileUtils.readFileToByteArray(new File(fileName));
         String xmlString = new String(b);
+        String contentRaw = xmlString;
         xmlString = evalStruct.eval(xmlString, evalStruct.serviceResultsMap, vars, evalStruct.jexl, evalStruct.jc);
         String urlString = protoHostPort+uri;
-        String contentRaw = xmlString;
         return doPOST_PUT(urlString, xmlString, contentRaw, BOUNDARY, method, contentType, authForTest, fromTestID); //method is POST or PUT.
     }
 
diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/XmlReplayDevTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/XmlReplayDevTest.java
index ff3b52933..a184cd7d5 100755
--- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/XmlReplayDevTest.java
+++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/XmlReplayDevTest.java
@@ -32,8 +32,13 @@ public class XmlReplayDevTest extends XmlReplayTest {
             System.out.println("Using default masterFile: "+masterFile);
         }
         XmlReplay replay = createXmlReplayUsingIntegrationTestsModule("..");
-        List<List<ServiceResult>> list = replay.runMaster(masterFile);
-        logTestForGroup(list, "XmlReplayMasterTest");
+        if (replay.masterConfigFileExists(masterFile)){           // CSPACE-4027
+             List<List<ServiceResult>> list = replay.runMaster(masterFile);
+             logTestForGroup(list, "XmlReplayMasterTest");
+        } else {
+            System.out.println("XmlReplayDevTest skipping local dev test "+masterFile+" because it doesn't exist in "+replay.getBaseDir()+".  This is expected behavior on a production installation.");
+        }
+
 
        //used for testing load.
        // bigLoop(masterFile);
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/TEST-REPORTS/reports-include.css b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/TEST-REPORTS/reports-include.css
new file mode 100644
index 000000000..03c97474f
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/TEST-REPORTS/reports-include.css
@@ -0,0 +1,25 @@
+.REPORTTIME       {background-color: white; color: black; text-decoration: none; font-family: Tahoma; font-size:10pt;
+                             border-width:  1px; border-color: black; border-style: solid; padding:  8px; margin-bottom: 20px;}
+.TESTGROUP       {background-color: lightblue; color: black; text-decoration: none; font-family: Tahoma; font-size:14pt;}
+.RUNINFO       {background-color: lightyellow; color: black; text-decoration: none; font-family: "Courier New", Courier, mono;
+                            font-size:10pt; white-space: pre; padding: 5px; }
+.LABEL                 {font-size: 9pt; color: gray;}
+.OK                 {font-size: 9pt; color: green;}
+.ERROR                 {font-size: 14pt; color: red; font-weight: bold;}
+.PAYLOAD           {background-color: white;}
+.TOPLINKS          { font-size: 14pt;  padding: 20px;}
+.DETAIL_TABLE {
+    font-family:"Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size: 12pt;
+    width:100%;
+    border-collapse:collapse;
+    border:2px solid #98bf21;
+    padding: 7px;
+}
+
+body {
+    background-color: #87cefa;
+    font-family:"Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size: 10pt;
+    }
+td          {background-color: #e0ffff;}
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/TEST-REPORTS/reports-include.js b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/TEST-REPORTS/reports-include.js
new file mode 100644
index 000000000..ab5a192de
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/TEST-REPORTS/reports-include.js
@@ -0,0 +1,29 @@
+function toggleDiv(divid){
+    if(document.getElementById(divid).style.display == 'none'){
+      document.getElementById(divid).style.display = 'block';
+    }else{
+      document.getElementById(divid).style.display = 'none';
+    }
+}
+
+// usage: <a href="javascript:openAll();">openAll</a>
+function openAll( ) {
+    var divs = document.getElementsByTagName("div");
+    for ( t = 0; t < divs.length; ++t )    {
+         var td = divs[t];
+         if (td.className == "PAYLOAD"){
+             td.style.display = "block";
+         }
+    }
+}
+
+// usage: <a href="javascript:openAll();">closeAll</a>
+function closeAll( ){
+    var divs = document.getElementsByTagName("div");
+    for ( t = 0; t < divs.length; ++t )    {
+        var td = divs[t];
+        if (td.className == "PAYLOAD"){
+            td.style.display = "none";
+        }
+    }
+}
\ No newline at end of file
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml
similarity index 50%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml
index 8c01f9730..0224862b8 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmlReplayMaster>
 <!-- Use this file to drive local testing.  
-     To run this file, do: 
+
+     To run this file, copy the checked-in file to your own local version of the correct name
+     in the same location.  If it is named dev-master.xml, then XmlReplayDevTest will pick it up.
+     If it is not there, XmlReplayDevTest will skip it, which is what we want for production, since 
+     production runs XmlReplayMasterTest which calls xml-replay-master.xml
+     
+     	  cd trunk/services/IntegrationTests/src/test/resources/test-data/xmlreplay/
+     	  cp dev-master-example.xml dev-master.xml
+
+     IMPORTANT :: DO NOT CHECK IN YOUR LOCAL COPY, CALLED dev-master.xml
+                  EITHER LEAVE IT AROUND AND IGNORE THE SVN UNVERSIONED FILE MESSAGE, 
+                    OR DELETE IT IF IT BOTHERS YOU.
+     
+     Then, to run this file, you can execute the following: 
+     
           cd trunk/services/IntegrationTests
           mvn test -Dtest=XmlReplayDevTest
+
      Maven surefire will kick off XmlReplayDevTest.
      
-     IMPORTANT :: DO NOT CHECK THIS FILE IN WITH ANY TESTS ACTIVE BELOW.
-		  Make sure all tests are commented out, or better yet, moved to dev-all.xml .
-		  This file should be modified locally and used instead of xml-replay-master.xml
-		  when you are developing.  This file can be used to point at a controlFile 
+                  
+     This file can be used to point at a controlFile 
 		  and a testGroup, so you can test just one thing at a time, or a limited suite.
      
      You can find other tests to run in two places:
@@ -18,7 +31,7 @@
        The set of possible tests, including ones that don't work:
          dev-all.xml
 -->
-    <protoHostPort>http://localhost:8280</protoHostPort>
+    <protoHostPort>http://localhost:8180</protoHostPort>
     
     <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->
     <dump payloads="false" dumpServiceResult="detailed" />
@@ -27,9 +40,9 @@
        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
     
-	<!--
+	<!-- EXAMPLES. JUST UNCOMMENT THEM, AND RUN AS SHOWN ABOVE.
 	<run controlFile="person/person.xml" testGroup="PersonAddRelsDeleteRels" />
 	<run controlFile="location/location-hierarchy.xml" testGroup="HierarchicLocation" />
-     -->
+    -->
 </xmlReplayMaster>
 
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-config.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-config.xml
deleted file mode 100755
index 9d4df10a4..000000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-config.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmlReplay>
-    <!--
-    How to use this file.
-    ======================
-    From a command-line, run, for example:
-        cd C:\cs\trunk\services\common-test
-        mvn exec:java
-    To run one testGroup with ID="2collectionobjects", use:
-        mvn -DtestGroupID=2collectionobjects exec:java
-
-    To run one test with ID="1001" in one testGroup "2collectionobjects", use:
-        mvn -DtestGroupID=2collectionobjects -DtestID=1001 exec:java
-
-    If you need to compile, you can use:
-      mvn -q  install exec:java
-
-    To make maven a bit more quiet (all the lovely INFO lines) run with
-        mvn -q
-    This class is not a test class, so if you want to skip other test classes, use
-       mvn -DskipTests
-    Example:
-        mvn -q -DskipTests  exec:java
-
-    Maven knows where to find the command line args.  It looks in the pom:
-       C:\cs\trunk\services\common-test\pom.xml
-    for the values under the element:
-        /project/build/plugins/plugin/artifactId[exec-maven-plugin]
-    However, you may override this with a full path
-        mvn  -DxmlReplayBaseDir="C:\tmp\xmlReplay" exec:java
-        
-    It always looks for this master config file, named "xml-replay-config.xml"
-
-    For URLs, any ampersands must be escaped in this file in query strings like so: &amp;
-
-    The attribute
-        /testGroup/test/@ID
-    is optional. If present, it may be referred to in a DELETE using
-        /testGroup/test/fromTestID/
-    If it is not present, the driver will use
-       /testGroup/test/part/filename
-    as the ID for POST tests.
-    If the attribute
-        /testGroup/@autoDeletePOSTS
-    is "true" then any POSTs that are sent that return a "Location:" header
-    will be deleted with DELETE at the end of the test group.
-    Alternately, you may delete them
-    manually by providing a DELETE test as specified above.
-
-    PUT methods also use the
-        /testGroup/test/fromTestID/
-    value to update the object posted by a POST test.
-
-    -->
-
-<!--
-    <testGroup ID="2collectionobjects" autoDeletePOSTS="true">
-        <test ID="1001">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_whitesp1.xml</filename>
-            </part>
-        </test>
-
-        <test ID="1002">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_whitesp2.xml</filename>
-            </part>
-        </test>
-    </testGroup>
-
-    <testGroup ID="2parts" autoDeletePOSTS="true">
-        <test ID="nh">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <parts>
-                <part>
-                    <label>collectionobjects_common</label>
-                    <filename>collectionobject/nh-collectionobject.xml</filename>
-                </part>
-                <part>
-                    <label>collectionobjects_naturalhistory</label>
-                    <filename>collectionobject/nh-part.xml</filename>
-                </part>
-            </parts>
-        </test>
-        <test>
-            <method>GET</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <fromTestID>nh</fromTestID>
-        </test>
-    </testGroup>
-
-    <testGroup ID="collectionobjects" autoDeletePOSTS="true">
-        <test ID="1001">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_whitesp1.xml</filename>
-            </part>
-        </test>
-        <test ID="1002">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_whitesp2.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_whitesp3.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>DELETE</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <fromTestID>1001</fromTestID>
-        </test>
-        <test>
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_whitesp4.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/cspace-2242-first-value-instance-blank.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/cspace-2242-first-value-instance-nonblank.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/repfield_null1.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>GET</method>
-            <uri>/cspace-services/collectionobjects/?sortBy=&amp;pgNum=0&amp;pgSz=8</uri>
-        </test>
-        <test ID="cambridge-1">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/testCambridge.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>GET</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <fromTestID>cambridge-1</fromTestID>
-        </test>
-        <test ID="cambridge-1-put">
-            <method>PUT</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/testCambridge-update.xml</filename>
-            </part>
-            <fromTestID>cambridge-1</fromTestID>
-        </test>
-    </testGroup>
-
-    <!-- You can run this with
-         mvn -q -DtestGroupID=cambridge-put-demo exec:java
-    -->
-    <testGroup ID="cambridge-put-demo" autoDeletePOSTS="true">
-        <test ID="cambridge-2">
-            <method>POST</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/testCambridge.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>GET</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <fromTestID>cambridge-2</fromTestID>
-        </test>
-        <test ID="cambridge-2-put">
-            <method>PUT</method>
-            <uri>/cspace-services/collectionobjects/</uri>
-            <part>
-                <label>collectionobjects_common</label>
-                <filename>collectionobject/testCambridge-update.xml</filename>
-            </part>
-            <fromTestID>cambridge-2</fromTestID>
-        </test>
-    </testGroup>
-
-    <!-- You can run this with
-         mvn -q -DtestGroupID=authrefs exec:java
-    -->
-    <testGroup ID="authrefs" autoDeletePOSTS="true">
-        <test ID="newPersonAuthority">
-            <method>POST</method>
-            <uri>/cspace-services/personauthorities/</uri>
-            <part>
-                <label>personauthorities_common</label>
-                <filename>authrefs/newPersonAuthority.xml</filename>
-            </part>
-        </test>
-        <test>
-            <method>GET</method>
-            <uri>/cspace-services/personauthorities/</uri>
-            <fromTestID>newPersonAuthority</fromTestID>
-        </test>
-        <test ID="newPerson">
-            <method>POST</method>
-            <uri>/cspace-services/personauthorities/</uri>
-            <part>
-                <label>persons_common</label>
-                <filename>authrefs/newPerson.xml</filename>
-            </part>
-            <fromTestID>newPersonAuthority</fromTestID>
-        </test>
-
-        <test ID="personAuthsList">
-            <method>LIST</method>
-            <uri>/cspace-services/personauthorities/</uri>
-            <fromTestID>newPersonAuthority</fromTestID>
-        </test>
-    </testGroup>
-
-
-
--->
-    
-
-
-</xmlReplay>
diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/Tools.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/Tools.java
index 4a405fffc..4cf7875e7 100755
--- a/services/common-api/src/main/java/org/collectionspace/services/common/api/Tools.java
+++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/Tools.java
@@ -57,6 +57,13 @@ public class Tools {
         return new Long((new java.util.Date()).getTime());
     }
 
+     public static String nowLocale(){
+        java.util.Date date = new java.util.Date();
+        String result = java.text.DateFormat.getDateTimeInstance().format(date);
+        date = null;
+        return result;
+    }
+
     /** Handles null strings as empty.  */
     public static boolean isEmpty(String str){
         return !notEmpty(str);
diff --git a/services/common/src/main/java/org/collectionspace/services/common/XmlSaxFragmenter.java b/services/common/src/main/java/org/collectionspace/services/common/XmlSaxFragmenter.java
index c53be9fe8..02e7702ff 100755
--- a/services/common/src/main/java/org/collectionspace/services/common/XmlSaxFragmenter.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/XmlSaxFragmenter.java
@@ -261,25 +261,6 @@ public class XmlSaxFragmenter implements ContentHandler, ErrorHandler {
         }
     }
 
-    public static String prettyPrint(Document document) {
-        String prettyHTML;
-        try {
-            StringWriter swriter = new StringWriter();
-            OutputFormat format = OutputFormat.createPrettyPrint();
-            format.setNewlines(true);
-            format.setTrimText(true);
-            format.setIndent(false);
-            format.setXHTML(true);
-            format.setLineSeparator(System.getProperty("line.separator")) ;
-            HTMLWriter writer = new HTMLWriter(swriter, format);
-            writer.write(document);
-            writer.flush();
-            prettyHTML = swriter.toString();
-        } catch (Exception e){
-            prettyHTML = "<?xml?><error>"+e+"</error>";
-        }
-        return prettyHTML;
-    }
 
     /** This method takes a filename of a local file only; InputSource is not implemented yet.
      *
diff --git a/services/common/src/main/java/org/collectionspace/services/common/XmlTools.java b/services/common/src/main/java/org/collectionspace/services/common/XmlTools.java
new file mode 100644
index 000000000..e97ff9d96
--- /dev/null
+++ b/services/common/src/main/java/org/collectionspace/services/common/XmlTools.java
@@ -0,0 +1,131 @@
+package org.collectionspace.services.common;
+
+import org.collectionspace.services.common.api.Tools;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.io.HTMLWriter;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+
+import java.io.StringWriter;
+
+public class XmlTools {
+
+
+    // @TODO Refactoring opportunity: the utility methods below
+    // could potentially be moved into the 'common' module,
+    // and made static and public.
+    //     -- DONE.   Moved here.  Laramie20110519
+
+    // Output format for XML pretty printing.
+    public final static OutputFormat PRETTY_PRINT_OUTPUT_FORMAT =  defaultPrettyPrintOutputFormat();
+
+
+    /**
+     * Returns a default output format for pretty printing an XML document.
+     *
+     * Uses the default settings for indentation, whitespace, etc.
+     * of a pre-defined dom4j output format.
+     *
+     * @return  A default output format for pretty printing an XML document.
+     */
+    protected static OutputFormat defaultPrettyPrintOutputFormat() {
+
+        // Use the default pretty print output format in dom4j.
+        OutputFormat outformat = OutputFormat.createPrettyPrint();
+        // Supress the extra newline added after the XML declaration
+        // in that output format.
+        outformat.setNewLineAfterDeclaration(false);
+        return outformat;
+    }
+
+    /** Returns a pretty printed String representation of an XML document.
+     * @param   doc        A dom4j XML Document.
+     * @return  A pretty printed String representation of an XML document.
+     */
+    public static String prettyPrintXML(Document doc) {
+
+        String xmlStr = "";
+        try {
+          xmlStr = formatXML(doc, PRETTY_PRINT_OUTPUT_FORMAT);
+        // If an error occurs during pretty printing, fall back to
+        // returning a default String representation of the XML document.
+        } catch (Exception e) {
+            System.err.println("Error pretty-printing XML: " + e.getMessage());
+            xmlStr = doc.asXML();
+        }
+
+        return xmlStr;
+    }
+
+    /**
+     * Returns a String representation of an XML document,
+     * formatted according to a specified output format.
+     * @param   doc        A dom4j XML Document.
+     * @param   outformat  A dom4j output format.
+     * @return  A String representation of an XML document,
+     *          formatted according to the specified output format.
+     * @throws Exception if an error occurs in printing
+     *          the XML document to a String.
+     */
+    public static String formatXML(Document doc, OutputFormat outformat)
+       throws Exception {
+
+        StringWriter sw = new StringWriter();
+        try {
+            final XMLWriter writer = new XMLWriter(sw, outformat);
+            // Print the document to the current writer.
+            writer.write(doc);
+        }
+        catch (Exception e) {
+            throw e;
+        }
+        return sw.toString();
+    }
+
+    /**
+     * Returns an XML document, when provided with a String
+     * representation of that XML document.
+     * @param   xmlStr  A String representation of an XML document.
+     * @return  A dom4j XML document.
+     */
+    public static Document textToXMLDocument(String xmlStr) throws Exception {
+
+        Document doc = null;
+        try {
+         doc = DocumentHelper.parseText(xmlStr);
+        } catch (DocumentException e) {
+          throw e;
+        }
+        return doc;
+    }
+
+    public static String prettyPrint(Document document) {
+            return prettyPrint(document, null);
+        }
+
+    public static String prettyPrint(Document document, String indentString) {
+        String prettyHTML;
+        try {
+            StringWriter swriter = new StringWriter();
+            OutputFormat format = OutputFormat.createPrettyPrint();
+            format.setNewlines(true);
+            format.setTrimText(true);
+            boolean indent = Tools.notEmpty(indentString);
+            format.setIndent(indent);
+            if (indent){
+                format.setIndent(indentString);
+            }
+            format.setXHTML(true);
+            format.setLineSeparator(System.getProperty("line.separator")) ;
+            HTMLWriter writer = new HTMLWriter(swriter, format);
+            writer.write(document);
+            writer.flush();
+            prettyHTML = swriter.toString();
+        } catch (Exception e){
+            prettyHTML = "<?xml?><error>"+e+"</error>";
+        }
+        return prettyHTML;
+    }
+}
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
index d2673165d..25515ae50 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
@@ -38,6 +38,7 @@ import javax.ws.rs.core.UriBuilder;
 
 // May at some point instead use
 // org.jboss.resteasy.spi.NotFoundException
+import org.collectionspace.services.common.XmlTools;
 import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.common.document.DocumentNotFoundException;
 
@@ -84,9 +85,6 @@ public class IDResource {
     final static String ID_GENERATOR_LIST_NAME = "idgenerator-list";
     final static String ID_GENERATOR_LIST_ITEM_NAME = "idgenerator-list-item";
 
-    // Output format for XML pretty printing.
-    final static OutputFormat PRETTY_PRINT_OUTPUT_FORMAT =
-        defaultPrettyPrintOutputFormat();
 
     // Base URL path for REST-based requests to the ID Service.
     //
@@ -193,8 +191,6 @@ public class IDResource {
     /**
      * Creates a new ID generator instance.
      *
-     * @param  generatorRepresentation
-     *         A representation of an ID generator instance.
      */
     @POST
     @Path("")
@@ -272,7 +268,7 @@ public class IDResource {
             // Append detailed information for this ID generator instance.
             root = appendDetailedIDGeneratorInformation(root, instance);
 
-            resourceRepresentation = prettyPrintXML(doc);
+            resourceRepresentation = XmlTools.prettyPrintXML(doc);
             response =
                 Response.status(Response.Status.OK)
                     .entity(resourceRepresentation)
@@ -510,7 +506,7 @@ public class IDResource {
             listitem = appendSummaryIDGeneratorInformation(listitem, csid);
        }
 
-       return prettyPrintXML(doc);
+       return XmlTools.prettyPrintXML(doc);
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -545,7 +541,7 @@ public class IDResource {
                 generators.get(csid));
         }
 
-        return prettyPrintXML(doc);
+        return XmlTools.prettyPrintXML(doc);
     }
     
     //////////////////////////////////////////////////////////////////////
@@ -657,7 +653,7 @@ public class IDResource {
         // components to a new XML document, copy its root element, and
         // append it to the relevant location within the current element.
         try {
-            Document generatorDoc = textToXMLDocument(generatorStr);
+            Document generatorDoc = XmlTools.textToXMLDocument(generatorStr);
             Element generatorRoot = generatorDoc.getRootElement();
             generator.add(generatorRoot.createCopy());
         // If an error occurs parsing the XML string representation,
@@ -672,104 +668,6 @@ public class IDResource {
     }
 
 
-    // @TODO Refactoring opportunity: the utility methods below
-    // could potentially be moved into the 'common' module,
-    // and made static and public.
-
-    //////////////////////////////////////////////////////////////////////
-    /**
-     * Returns a default output format for pretty printing an XML document.
-     *
-     * Uses the default settings for indentation, whitespace, etc.
-     * of a pre-defined dom4j output format.
-     *
-     * @return  A default output format for pretty printing an XML document.
-     */
-    private static OutputFormat defaultPrettyPrintOutputFormat() {
-
-        // Use the default pretty print output format in dom4j.
-        OutputFormat outformat = OutputFormat.createPrettyPrint();
-        // Supress the extra newline added after the XML declaration
-        // in that output format.
-        outformat.setNewLineAfterDeclaration(false);
-        return outformat;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    /**
-     * Returns a pretty printed String representation of an XML document.
-     *
-     * @param   doc        A dom4j XML Document.
-     *
-     * @return  A pretty printed String representation of an XML document.
-     */
-    private String prettyPrintXML(Document doc) {
-
-        String xmlStr = "";
-        try {
-          xmlStr = formatXML(doc, PRETTY_PRINT_OUTPUT_FORMAT);
-        // If an error occurs during pretty printing, fall back to
-        // returning a default String representation of the XML document.
-        } catch (Exception e) {
-            if (logger.isDebugEnabled()) {
-              logger.debug("Error pretty-printing XML: " + e.getMessage());
-            }
-            xmlStr = doc.asXML();
-        }
-
-        return xmlStr;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    /**
-     * Returns a String representation of an XML document,
-     * formatted according to a specified output format.
-     *
-     * @param   doc        A dom4j XML Document.
-     *
-     * @param   outformat  A dom4j output format.
-     *
-     * @return  A String representation of an XML document,
-     *          formatted according to the specified output format.
-     *
-     * @throws  An Exception if an error occurs in printing
-     *          the XML document to a String.
-     */
-    private String formatXML(Document doc, OutputFormat outformat)
-       throws Exception {
-
-        StringWriter sw = new StringWriter();
-        try {
-            final XMLWriter writer = new XMLWriter(sw, outformat);
-            // Print the document to the current writer.
-            writer.write(doc);
-        }
-        catch (Exception e) {
-            throw e;
-        }
-        return sw.toString();
-    }
-
-     //////////////////////////////////////////////////////////////////////
-    /**
-     * Returns an XML document, when provided with a String
-     * representation of that XML document.
-     *
-     * @param   xmlStr  A String representation of an XML document.
-     *
-     * @return  A dom4j XML document.
-     */
-    private Document textToXMLDocument(String xmlStr) throws Exception {
-        
-        Document doc = null;
-        try {
-         doc = DocumentHelper.parseText(xmlStr);
-        } catch (DocumentException e) {
-          throw e;
-        }
-        return doc;
-    }
-
     //////////////////////////////////////////////////////////////////////
     /**
      * Returns a relative URI path to a resource
diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
index f98d7ce09..d34aa480c 100755
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
@@ -29,6 +29,7 @@ import java.util.UUID;
 
 import org.collectionspace.services.common.IFragmentHandler;
 import org.collectionspace.services.common.XmlSaxFragmenter;
+import org.collectionspace.services.common.XmlTools;
 import org.collectionspace.services.common.api.FileTools;
 import org.collectionspace.services.common.api.Tools;
 import org.dom4j.Document;
@@ -137,7 +138,7 @@ public class TemplateExpander {
             }
         }
         public void onEndDocument(Document document, int fragmentCount){
-            System.out.println("====TemplateExpander DONE============\r\n"+ XmlSaxFragmenter.prettyPrint(document)+"================");
+            System.out.println("====TemplateExpander DONE============\r\n"+ XmlTools.prettyPrint(document)+"================");
         }
         //============helper methods==============================================================
         public FragmentHandlerImpl(String templateDir, String outputDir){
@@ -157,7 +158,7 @@ public class TemplateExpander {
         }
         private void dump(Document context, String currentPath, int fragmentIndex, String fragment){
             System.out.println("====Path============\r\n"+currentPath+'['+fragmentIndex+']');
-            System.out.println("====Context=========\r\n"+ XmlSaxFragmenter.prettyPrint(context));
+            System.out.println("====Context=========\r\n"+ XmlTools.prettyPrint(context));
             System.out.println("====Fragment========\r\n"+fragment+"\r\n===================\r\n");
         }
     }