CSPACE-6329: Configure an additional attribute. Remove cruft: now-extraneous log...

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index 67d0656048760e2fbbdada81624422284f35e453..04292ab2f85f14dda4578d9207913468392901b1 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -204,9 +204,7 @@ public class ServiceMain {
                     File repofile = new File(getNuxeoConfigDir() + File.separator +\r
                             repositoryName + JEEServerDeployment.NUXEO_REPO_CONFIG_FILENAME_SUFFIX);\r
                     logger.warn(String.format("Repository config filepath is %s", repofile.getAbsolutePath()));\r
-                    // FIXME: Remove the duplicate call here (likely the first)\r
                     XmlTools.xmlDocumentToFile(repositoryConfigDoc, repofile);\r
-                    XmlTools.xmlDocumentToFile(repositoryConfigDoc, repofile, null);\r
                 }\r
             }\r
         }\r
@@ -806,42 +804,32 @@ public class ServiceMain {
     private Document updateRepositoryConfigDoc(Document repoConfigDoc, String repositoryName) {\r
         // FIXME: Remove this temporary placeholder variable used only during development.\r
         final String PLACEHOLDER = "placeholder";\r
-        // logger.warn("Before edits=\n" + repoConfigDoc.asXML());\r
-        // Text substitutions within first extension point\r
+        repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
+                "/component", "name", String.format("config:%s-repository", repositoryName));\r
+        // Text substitutions within first extension point, "repository"\r
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository", "name", repositoryName);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/xa-datasource", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='URL']", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='ServerName']", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='DatabaseName']", repositoryName);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='User']", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='Password']", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
-        // Text substitutions within second extension point\r
+        // Text substitutions within second extension point, "repositories"\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORIES_EXTENSION_POINT_XPATH + "/documentation", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
                 REPOSITORIES_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
                 REPOSITORIES_EXTENSION_POINT_XPATH + "/repository", "label", PLACEHOLDER);\r
-        // logger.warn("After edit=\n" + repoConfigDoc.asXML());\r
         return repoConfigDoc;\r
     }\r
 \r

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
index 66a6b3bcef4c3ed592dc0007932c330df14561d5..03f3b6e5364badd366cc4c21b04b028b2489065e 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/XmlTools.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/XmlTools.java
@@ -124,54 +124,29 @@ public class XmlTools {
         return doc;
     }
     
-    /**
-     * Writes a dom4j XML document to a file on disk, using a default
-     * pretty-printed output format.  Uses UTF-8 character encoding.
-     * @param  doc  A dom4j XML document.
-     * @param  file  A file.
-     */
-    public static void xmlDocumentToFile(Document doc, File file) throws Exception {
-        xmlDocumentToFile(doc, file, PRETTY_PRINT_OUTPUT_FORMAT);
-    }
-    
     /**
      * Writes a dom4j XML document to a file on disk. Uses UTF-8 character
      * encoding.
      * @param  doc  A dom4j XML document.
      * @param  file  A file.
-     * @param  outputFormat  An output format.
      */
-    public static void xmlDocumentToFile(Document doc, File file, OutputFormat outputFormat) throws Exception {
+    public static void xmlDocumentToFile(Document doc, File file) throws Exception {
         if (doc == null) {
-            System.out.println("Document is null");
             System.err.println("Document is null");
             return;
         }
         FileWriter filewriter = null;
-        XMLWriter writer = null;
         try {
             filewriter = new FileWriter(file);
+            // asXML() appears to output an adequate serialization, thus
+            // obviating the need to use an XML-aware writer here.
             filewriter.write(doc.asXML());
             filewriter.flush();
             filewriter.close();
-//            XMLWriter writer = new XMLWriter(filewriter, outputFormat);
-//            writer.write(doc);
-//            writer.flush();
         } catch (Exception e) {
-            System.out.println(e.getStackTrace());
             System.err.println(e.getStackTrace());
             throw e;
         } finally {
-            // XMLWriter doesn't implement Closeable, so
-            // we'll need to close it directly here, rather
-            // than invoking closeQuietly().
-//            if (writer != null) {
-//                try {
-//                    writer.close();
-//                } catch (IOException e) {
-//                    // Do nothing here
-//                }
-//            }
             closeQuietly(filewriter);
        }
     }