w3c
diff --git a/‎src/main/java/com/adobe/epubcheck/util/XmlReportImpl.java
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎src/main/java/com/adobe/epubcheck/util/XmlReportImpl.java
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎src/test/resources/com/adobe/epubcheck/test/DTBook/Basic_expected_results.xml
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎src/test/resources/com/adobe/epubcheck/test/DTBook/Basic_expected_results.xml
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎src/test/resources/com/adobe/epubcheck/test/command_line/xmlfile_expected_results.xml
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions b/‎src/test/resources/com/adobe/epubcheck/test/command_line/xmlfile_expected_results.xml
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions
@@ -26,13 +26,13 @@ public int generateReport()
     generationDate = fromTime(System.currentTimeMillis());
     try
     {
-      setNamespace("https://hul.harvard.edu/ois/xml/ns/jhove");
+      setNamespace("https://schema.openpreservation.org/ois/xml/ns/jhove");
       addPrefixNamespace("xsi","https://www.w3.org/2001/XMLSchema-instance");
 	  List<KeyValue<String, String>> attrs = new ArrayList<KeyValue<String, String>>();
 	  attrs.add(KeyValue.with("name", epubCheckName));
 	  attrs.add(KeyValue.with("release", epubCheckVersion)); 
 	  attrs.add(KeyValue.with("date", epubCheckDate));
-	  attrs.add(KeyValue.with("xsi:schemaLocation", "https://hul.harvard.edu/ois/xml/ns/jhove http://hul.harvard.edu/ois/xml/xsd/jhove/jhove.xsd"));
+	  attrs.add(KeyValue.with("xsi:schemaLocation", "https://schema.openpreservation.org/ois/xml/ns/jhove https://schema.openpreservation.org/ois/xml/xsd/jhove/jhove.xsd"));
 	  startElement("jhove", attrs);
 
 	  generateElement("date", generationDate);
@@ -69,7 +69,7 @@ public int generateReport()
 				loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";
 			  }
               generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,
-            		  KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "error"));
+            		  KeyValue.with("id", c.getID()), KeyValue.with("severity", "error"));
         	}
         }
         for (CheckMessage c : errors) {
@@ -80,7 +80,7 @@ public int generateReport()
 				loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";
 			  }
               generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,
-            		  KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "error"));
+            		  KeyValue.with("id", c.getID()), KeyValue.with("severity", "error"));
         	}
         }
         for (CheckMessage c : warns) {
@@ -91,7 +91,7 @@ public int generateReport()
 				loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";
 			  }
               generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,
-            		  KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "error"));
+            		  KeyValue.with("id", c.getID()), KeyValue.with("severity", "warning"));
         	}
         }
         for (CheckMessage c : hints) {
@@ -102,7 +102,7 @@ public int generateReport()
 				loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";
 			  }
               generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,
-            		  KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "info"));
+            		  KeyValue.with("id", c.getID()), KeyValue.with("severity", "info"));
         	}
         }
         endElement("messages");
 
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jhove xmlns="https://hul.harvard.edu/ois/xml/ns/jhove"
+<jhove xmlns="https://schema.openpreservation.org/ois/xml/ns/jhove"
        xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
        date="2017-01-02"
        name="epubcheck"
        release="4.0.3-SNAPSHOT"
-       xsi:schemaLocation="https://hul.harvard.edu/ois/xml/ns/jhove http://hul.harvard.edu/ois/xml/xsd/jhove/jhove.xsd">
+       xsi:schemaLocation="https://schema.openpreservation.org/ois/xml/ns/jhove https://schema.openpreservation.org/ois/xml/xsd/jhove/jhove.xsd">
  <date>2017-01-02T18:40:30+01:00</date>
  <repInfo uri="/Users/tofi/dev/epubcheck/target/test-classes/com/adobe/epubcheck/test/DTBook/Basic.epub">
   <created>2017-01-02T18:34:14Z</created>
   <format>application/epub+zip</format>
   <version>2.0.1</version>
   <status>Well-formed</status>
   <messages>
-   <message severity="error" subMessage="OPF-021">OPF-021, WARN, [Use of non-registered URI scheme type in href: 'waka://barnesandnoble.com'.], OPS/AreYouReadyV3.xml (25-69)</message>
-   <message severity="info" subMessage="HTM-010">HTM-010, HINT, [Namespace uri 'https://www.daisy.org/z3986/2005/ncx/' was found.], OPS/toc.ncx (2-68)</message>
+   <message severity="warning" id="OPF-021">OPF-021, WARN, [Use of non-registered URI scheme type in href: 'waka://barnesandnoble.com'.], OPS/AreYouReadyV3.xml (25-69)</message>
+   <message severity="info" id="HTM-010">HTM-010, HINT, [Namespace uri 'https://www.daisy.org/z3986/2005/ncx/' was found.], OPS/toc.ncx (2-68)</message>
   </messages>
   <mimeType>application/epub+zip</mimeType>
   <properties>
 
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jhove xmlns="https://hul.harvard.edu/ois/xml/ns/jhove"
+<jhove xmlns="https://schema.openpreservation.org/ois/xml/ns/jhove"
        xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
        date="2019-02-05"
        name="epubcheck"
        release="4.2.0-beta-SNAPSHOT"
-       xsi:schemaLocation="https://hul.harvard.edu/ois/xml/ns/jhove http://hul.harvard.edu/ois/xml/xsd/jhove/jhove.xsd">
+       xsi:schemaLocation="https://schema.openpreservation.org/ois/xml/ns/jhove https://schema.openpreservation.org/ois/xml/xsd/jhove/jhove.xsd">
    <date>2019-02-05T15:38:26+01:00</date>
    <repInfo uri="/Users/Romain/Work/epubcheck/epubcheck/target/test-classes/com/adobe/epubcheck/test/command_line/xmlfile.epub">
       <created>2019-02-05T15:38:16Z</created>
@@ -13,17 +13,17 @@
       <version>3.0.1</version>
       <status>Well-formed</status>
       <messages>
-         <message severity="info" subMessage="ACC-008">ACC-008, HINT, [Navigation Document has no 'landmarks nav' element.], OPS/toc.xhtml</message>
-         <message severity="info" subMessage="HTM-010">HTM-010, HINT, [Namespace uri 'https://www.daisy.org/z3986/2005/ncx/' was found.], OPS/toc.ncx (2-68)</message>
-         <message severity="info" subMessage="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style.css (3-23)</message>
-         <message severity="info" subMessage="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style.css (8-23)</message>
-         <message severity="info" subMessage="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style_tag_css.xhtml (8-31)</message>
-         <message severity="info" subMessage="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style_tag_css.xhtml (13-31)</message>
-         <message severity="info" subMessage="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style_tag_css.xhtml (5-28)</message>
-         <message severity="info" subMessage="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (10-119)</message>
-         <message severity="info" subMessage="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (11-115)</message>
-         <message severity="info" subMessage="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (14-116)</message>
-         <message severity="info" subMessage="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (15-114)</message>
+         <message severity="info" id="ACC-008">ACC-008, HINT, [Navigation Document has no 'landmarks nav' element.], OPS/toc.xhtml</message>
+         <message severity="info" id="HTM-010">HTM-010, HINT, [Namespace uri 'https://www.daisy.org/z3986/2005/ncx/' was found.], OPS/toc.ncx (2-68)</message>
+         <message severity="info" id="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style.css (3-23)</message>
+         <message severity="info" id="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style.css (8-23)</message>
+         <message severity="info" id="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style_tag_css.xhtml (8-31)</message>
+         <message severity="info" id="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style_tag_css.xhtml (13-31)</message>
+         <message severity="info" id="CSS-009">CSS-009, HINT, [Use of certain CSS such as Columns, Transforms, Transitions, box-sizing or KeyFrames can cause pagination issues.], OPS/style_tag_css.xhtml (5-28)</message>
+         <message severity="info" id="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (10-119)</message>
+         <message severity="info" id="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (11-115)</message>
+         <message severity="info" id="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (14-116)</message>
+         <message severity="info" id="ACC-013">ACC-013, HINT, [Content file contains at least one inline style declaration.], OPS/inline_css.xhtml (15-114)</message>
       </messages>
       <mimeType>application/epub+zip</mimeType>
       <properties>
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ public int generateReport()`
`26`	`26`	`generationDate = fromTime(System.currentTimeMillis());`
`27`	`27`	`try`
`28`	`28`	`{`
`29`		`- setNamespace("https://hul.harvard.edu/ois/xml/ns/jhove");`
	`29`	`+ setNamespace("https://schema.openpreservation.org/ois/xml/ns/jhove");`
`30`	`30`	`addPrefixNamespace("xsi","https://www.w3.org/2001/XMLSchema-instance");`
`31`	`31`	`List<KeyValue<String, String>> attrs = new ArrayList<KeyValue<String, String>>();`
`32`	`32`	`attrs.add(KeyValue.with("name", epubCheckName));`
`33`	`33`	`attrs.add(KeyValue.with("release", epubCheckVersion));`
`34`	`34`	`attrs.add(KeyValue.with("date", epubCheckDate));`
`35`		`- attrs.add(KeyValue.with("xsi:schemaLocation", "https://hul.harvard.edu/ois/xml/ns/jhove http://hul.harvard.edu/ois/xml/xsd/jhove/jhove.xsd"));`
	`35`	`+ attrs.add(KeyValue.with("xsi:schemaLocation", "https://schema.openpreservation.org/ois/xml/ns/jhove https://schema.openpreservation.org/ois/xml/xsd/jhove/jhove.xsd"));`
`36`	`36`	`startElement("jhove", attrs);`
`37`	`37`
`38`	`38`	`generateElement("date", generationDate);`
`@@ -69,7 +69,7 @@ public int generateReport()`
`69`	`69`	`loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";`
`70`	`70`	`}`
`71`	`71`	`generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,`
`72`		`- KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "error"));`
	`72`	`+ KeyValue.with("id", c.getID()), KeyValue.with("severity", "error"));`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`for (CheckMessage c : errors) {`
`@@ -80,7 +80,7 @@ public int generateReport()`
`80`	`80`	`loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";`
`81`	`81`	`}`
`82`	`82`	`generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,`
`83`		`- KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "error"));`
	`83`	`+ KeyValue.with("id", c.getID()), KeyValue.with("severity", "error"));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`for (CheckMessage c : warns) {`
`@@ -91,7 +91,7 @@ public int generateReport()`
`91`	`91`	`loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";`
`92`	`92`	`}`
`93`	`93`	`generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,`
`94`		`- KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "error"));`
	`94`	`+ KeyValue.with("id", c.getID()), KeyValue.with("severity", "warning"));`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`for (CheckMessage c : hints) {`
`@@ -102,7 +102,7 @@ public int generateReport()`
`102`	`102`	`loc = " (" + ml.getLine() + "-" + ml.getColumn() + ")";`
`103`	`103`	`}`
`104`	`104`	`generateElement("message", m + PathUtil.removeWorkingDirectory(ml.getPath()) + loc,`
`105`		`- KeyValue.with("subMessage", c.getID()), KeyValue.with("severity", "info"));`
	`105`	`+ KeyValue.with("id", c.getID()), KeyValue.with("severity", "info"));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`endElement("messages");`