From 3dcd10128cd3aa89cf1c3662a904c16bfaeaa679 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Wed, 5 Mar 2014 13:52:11 -0800 Subject: [PATCH] CSPACE-6329: Configure an additional attribute. Remove cruft: now-extraneous log statements, commented-out code, etc. --- .../services/common/ServiceMain.java | 20 +++--------- .../services/common/XmlTools.java | 31 ++----------------- 2 files changed, 7 insertions(+), 44 deletions(-) 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 67d065604..04292ab2f 100644 --- 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 + repositoryName + JEEServerDeployment.NUXEO_REPO_CONFIG_FILENAME_SUFFIX); logger.warn(String.format("Repository config filepath is %s", repofile.getAbsolutePath())); - // FIXME: Remove the duplicate call here (likely the first) XmlTools.xmlDocumentToFile(repositoryConfigDoc, repofile); - XmlTools.xmlDocumentToFile(repositoryConfigDoc, repofile, null); } } } @@ -806,42 +804,32 @@ public class ServiceMain { private Document updateRepositoryConfigDoc(Document repoConfigDoc, String repositoryName) { // FIXME: Remove this temporary placeholder variable used only during development. final String PLACEHOLDER = "placeholder"; - // logger.warn("Before edits=\n" + repoConfigDoc.asXML()); - // Text substitutions within first extension point + repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, + "/component", "name", String.format("config:%s-repository", repositoryName)); + // Text substitutions within first extension point, "repository" repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository", "name", repositoryName); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/xa-datasource", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='URL']", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='ServerName']", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='DatabaseName']", repositoryName); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='User']", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='Password']", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); - // Text substitutions within second extension point + // Text substitutions within second extension point, "repositories" repoConfigDoc = XmlTools.setElementValue(repoConfigDoc, REPOSITORIES_EXTENSION_POINT_XPATH + "/documentation", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, REPOSITORIES_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, REPOSITORIES_EXTENSION_POINT_XPATH + "/repository", "label", PLACEHOLDER); - // logger.warn("After edit=\n" + repoConfigDoc.asXML()); return repoConfigDoc; } 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 66a6b3bce..03f3b6e53 100644 --- 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); } } -- 2.47.3