Author: rfelden
Date: Wed Jul 4 10:13:34 2007
New Revision: 6
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D6&repname=3Df=
ix_apply
Log:
first try to clean XML documents
not efficient yet
still issues with conf merging (XML)
Added:
branches/jahia/utils/src/main/java/org/jahia/utils/DocumentCleaner.java
Modified:
branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java
Added: branches/jahia/utils/src/main/java/org/jahia/utils/DocumentCleaner.j=
ava
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/jahia=
/utils/src/main/java/org/jahia/utils/DocumentCleaner.java&rev=3D6&repname=
=3Dfix_apply
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/jahia/utils/src/main/java/org/jahia/utils/DocumentCleaner.java=
(added)
+++ branches/jahia/utils/src/main/java/org/jahia/utils/DocumentCleaner.java=
Wed Jul 4 10:13:34 2007
@@ -0,0 +1,47 @@
+package org.jahia.utils;
+
+import java.io.File;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * @author Romain Felden
+ * @version 2007-07-02
+ */
+public class DocumentCleaner {
+
+ public static void cleanXMLFile(File file) {
+ if (file =3D=3D null || !file.exists()) {
+ return ;
+ }
+
+ System.out.println("cleaning file: " + file.getAbsolutePath()) ;
+
+ ArrayList lines =3D Tools.readLinesFromFile(file) ;
+
+ for (int i =3D 0; i < lines.size(); i++) {
+ String line =3D (String) lines.get(i) ;
+
+ String cleaned =3D StringUtils.replaceAllTokens(line, "<!---",=
"<!--") ;
+
+ lines.set(i, cleaned) ;
+ }
+
+ try {
+ BufferedWriter writer =3D new BufferedWriter(new FileWriter(fi=
le)) ;
+ for (java.util.Iterator it =3D lines.iterator(); it.hasNext();=
) {
+ String str =3D (String) it.next();
+ writer.write(str);
+ writer.write(System.getProperty("line.separator"));
+ }
+ writer.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+}
Modified: branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerge=
r.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/jahia/utils/=
src/main/java/org/jahia/utils/merge/XMLMerger.java&rev=3D6&repname=3Dfix_ap=
ply
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java=
(original)
+++ branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java=
Wed Jul 4 10:13:34 2007
@@ -4,6 +4,7 @@
import org.jdom.output.XMLOutputter;
import org.jdom.output.Format;
import org.jdom.input.SAXBuilder;
+import org.jahia.utils.DocumentCleaner;
=
import java.io.*;
import java.util.List;
@@ -28,6 +29,11 @@
=
try {
=
+ // clean XML files
+ DocumentCleaner.cleanXMLFile(update);
+ DocumentCleaner.cleanXMLFile(old);
+ DocumentCleaner.cleanXMLFile(existing);
+
// load the configurations from the files
Document updateConfiguration =3D buildFromFile(update) ;
Document oldConfiguration =3D buildFromFile(old) ;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
