1.1 --- a/html.validation/external/binaries-list	Tue Nov 03 12:00:57 2015 +0100
     1.2 +++ b/html.validation/external/binaries-list	Tue Nov 03 16:38:33 2015 +0100
     1.3 @@ -1,9 +1,6 @@
     1.4 -F4A1696661E6233F8C27EE323CAEF9CB052666F1 html5-datatypes.jar
     1.5 -A2862B7795EF0E0F0716BEC84528FA3B629E479C io-xml-util.jar
     1.6  0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0 iri.jar
     1.7  483A61B688B13C62BB201A683D98A6688B5373B6 jing.jar
     1.8  F0A0D2E29ED910808C33135A3A5A51BBA6358F7B log4j-1.2.15.jar
     1.9 -010FC8BD229B7F68C8C4D5BDE399475373096601 non-schema.jar
    1.10 -6FC6098C230D7CBA5730106D379CBBB42F6EC48A validator.jar
    1.11 +5C322A10E13FADE0451263035B7AA26B63AAFA47 validator.jar
    1.12  85A67D883A879E7BF767758A8413B690DEF29735 saxon9B.jar
    1.13  FACC6D84B0B0A650B1D44FED941E9ADD9F326862 isorelax.jar

     2.1 --- a/html.validation/external/validator-license.txt	Tue Nov 03 12:00:57 2015 +0100
     2.2 +++ b/html.validation/external/validator-license.txt	Tue Nov 03 16:38:33 2015 +0100
     2.3 @@ -1,5 +1,5 @@
     2.4  Name: Validator.nu
     2.5 -Version: 20130529
     2.6 +Version: 20150629
     2.7  License: MIT-validator
     2.8  OSR: -
     2.9  Files: validator.jar

     3.1 --- a/html.validation/nbproject/project.properties	Tue Nov 03 12:00:57 2015 +0100
     3.2 +++ b/html.validation/nbproject/project.properties	Tue Nov 03 16:38:33 2015 +0100
     3.3 @@ -40,21 +40,15 @@
     3.4  # Version 2 license, then the option applies only if the new code is
     3.5  # made subject to such option by the copyright holder.
     3.6  
     3.7 -file.reference.html5-datatypes.jar=external/html5-datatypes.jar
     3.8 -file.reference.io-xml-util.jar=external/io-xml-util.jar
     3.9  file.reference.iri.jar=external/iri.jar
    3.10  file.reference.jing.jar=external/jing.jar
    3.11  file.reference.log4j-1.2.15.jar=external/log4j-1.2.15.jar
    3.12 -file.reference.non-schema.jar=external/non-schema.jar
    3.13  file.reference.validator.jar=external/validator.jar
    3.14  file.reference.saxon9B.jar=external/saxon9B.jar
    3.15  file.reference.isorelax.jar=external/isorelax.jar
    3.16 -release.external/html5-datatypes.jar=modules/ext/html5-datatypes.jar
    3.17 -release.external/io-xml-util.jar=modules/ext/io-xml-util.jar
    3.18  release.external/iri.jar=modules/ext/iri.jar
    3.19  release.external/jing.jar=modules/ext/jing.jar
    3.20  release.external/log4j-1.2.15.jar=modules/ext/log4j-1.2.15.jar
    3.21 -release.external/non-schema.jar=modules/ext/non-schema.jar
    3.22  release.external/validator.jar=modules/ext/validator.jar
    3.23  release.external/saxon9B.jar=modules/ext/saxon9B.jar
    3.24  release.external/isorelax.jar=modules/ext/isorelax.jar

     4.1 --- a/html.validation/nbproject/project.xml	Tue Nov 03 12:00:57 2015 +0100
     4.2 +++ b/html.validation/nbproject/project.xml	Tue Nov 03 16:38:33 2015 +0100
     4.3 @@ -136,8 +136,12 @@
     4.4              </test-dependencies>
     4.5              <public-packages/>
     4.6              <class-path-extension>
     4.7 -                <runtime-relative-path>ext/io-xml-util.jar</runtime-relative-path>
     4.8 -                <binary-origin>external/io-xml-util.jar</binary-origin>
     4.9 +                <runtime-relative-path>ext/jing.jar</runtime-relative-path>
    4.10 +                <binary-origin>external/jing.jar</binary-origin>
    4.11 +            </class-path-extension>
    4.12 +            <class-path-extension>
    4.13 +                <runtime-relative-path>ext/saxon9B.jar</runtime-relative-path>
    4.14 +                <binary-origin>external/saxon9B.jar</binary-origin>
    4.15              </class-path-extension>
    4.16              <class-path-extension>
    4.17                  <runtime-relative-path>ext/log4j-1.2.15.jar</runtime-relative-path>
    4.18 @@ -148,26 +152,10 @@
    4.19                  <binary-origin>external/iri.jar</binary-origin>
    4.20              </class-path-extension>
    4.21              <class-path-extension>
    4.22 -                <runtime-relative-path>ext/jing.jar</runtime-relative-path>
    4.23 -                <binary-origin>external/jing.jar</binary-origin>
    4.24 -            </class-path-extension>
    4.25 -            <class-path-extension>
    4.26                  <runtime-relative-path>ext/validator.jar</runtime-relative-path>
    4.27                  <binary-origin>external/validator.jar</binary-origin>
    4.28              </class-path-extension>
    4.29              <class-path-extension>
    4.30 -                <runtime-relative-path>ext/html5-datatypes.jar</runtime-relative-path>
    4.31 -                <binary-origin>external/html5-datatypes.jar</binary-origin>
    4.32 -            </class-path-extension>
    4.33 -            <class-path-extension>
    4.34 -                <runtime-relative-path>ext/non-schema.jar</runtime-relative-path>
    4.35 -                <binary-origin>external/non-schema.jar</binary-origin>
    4.36 -            </class-path-extension>
    4.37 -            <class-path-extension>
    4.38 -                <runtime-relative-path>ext/saxon9B.jar</runtime-relative-path>
    4.39 -                <binary-origin>external/saxon9B.jar</binary-origin>
    4.40 -            </class-path-extension>
    4.41 -            <class-path-extension>
    4.42                  <runtime-relative-path>ext/isorelax.jar</runtime-relative-path>
    4.43                  <binary-origin>external/isorelax.jar</binary-origin>
    4.44              </class-path-extension>

     5.1 --- a/html.validation/src/org/netbeans/modules/html/validation/ValidationTransaction.java	Tue Nov 03 12:00:57 2015 +0100
     5.2 +++ b/html.validation/src/org/netbeans/modules/html/validation/ValidationTransaction.java	Tue Nov 03 16:38:33 2015 +0100
     5.3 @@ -43,8 +43,11 @@
     5.4  import javax.xml.parsers.ParserConfigurationException;
     5.5  import javax.xml.parsers.SAXParser;
     5.6  import javax.xml.parsers.SAXParserFactory;
     5.7 +import nu.validator.checker.XmlPiChecker;
     5.8 +import nu.validator.checker.jing.CheckerSchema;
     5.9  import nu.validator.htmlparser.common.*;
    5.10  import nu.validator.htmlparser.sax.HtmlParser;
    5.11 +import nu.validator.io.DataUri;
    5.12  import nu.validator.messages.MessageEmitterAdapter;
    5.13  import nu.validator.messages.TooManyErrorsException;
    5.14  import nu.validator.servlet.ParserMode;
    5.15 @@ -62,9 +65,6 @@
    5.16  import org.netbeans.modules.html.validation.patched.LocalCacheEntityResolver;
    5.17  import org.netbeans.modules.html.validation.patched.RootNamespaceSniffer;
    5.18  import org.openide.util.NbBundle;
    5.19 -import org.whattf.checker.XmlPiChecker;
    5.20 -import org.whattf.checker.jing.CheckerSchema;
    5.21 -import org.whattf.io.DataUri;
    5.22  import org.xml.sax.*;
    5.23  import org.xml.sax.ext.LexicalHandler;
    5.24  
    5.25 @@ -146,7 +146,6 @@
    5.26      protected XMLReader reader;
    5.27      private CharacterHandlerReader sourceReader;
    5.28      protected TypedInputSource documentInput;
    5.29 -    protected PrudentHttpEntityResolver httpRes;
    5.30      protected DataUriEntityResolver dataRes;
    5.31      protected ContentTypeParser contentTypeParser;
    5.32      private Map<String, Validator> loadedValidatorUrls = new HashMap<String, Validator>();
    5.33 @@ -182,11 +181,11 @@
    5.34          //IMO should be fixed in validator.nu by using the local cache entity resolver.
    5.35  
    5.36          //MessageEmitterAdapter:
    5.37 -        URL url = LocalCacheEntityResolver.getResource("http://wiki.whatwg.org/wiki/MicrosyntaxDescriptions");
    5.38 -        System.setProperty("nu.validator.spec.microsyntax-descriptions", url.toExternalForm());
    5.39 -
    5.40 -        url = LocalCacheEntityResolver.getResource("http://wiki.whatwg.org/wiki/Validator.nu_alt_advice");
    5.41 -        System.setProperty("nu.validator.spec.alt-advice", url.toExternalForm());
    5.42 +//        URL url = LocalCacheEntityResolver.getResource("http://wiki.whatwg.org/wiki/MicrosyntaxDescriptions");
    5.43 +//        System.setProperty("nu.validator.spec.microsyntax-descriptions", url.toExternalForm());
    5.44 +//
    5.45 +//        url = LocalCacheEntityResolver.getResource("http://wiki.whatwg.org/wiki/Validator.nu_alt_advice");
    5.46 +//        System.setProperty("nu.validator.spec.alt-advice", url.toExternalForm());
    5.47  
    5.48  //        //CharsetData:
    5.49  //        url = LocalCacheEntityResolver.getResource("http://www.iana.org/assignments/character-sets");
    5.50 @@ -464,7 +463,7 @@
    5.51          int lineOffset = 0;
    5.52  
    5.53          errorHandler = new MessageEmitterAdapter(sourceCode,
    5.54 -                showSource, null, lineOffset,
    5.55 +                showSource, null,  lineOffset, false,
    5.56                  new NbMessageEmitter(problemsHandler, linesMapper, true));
    5.57  
    5.58          errorHandler.setLoggingOk(true);