wow, I don't like this in XML, encoding is self provided with such feature, an XML-invalid document can be read by Maven (and Maven only, since it is XML-invalid)
I'm -1 on this: we can't help people make Maven-specific pseudo XML Regards, Hervé ----- Mail original ----- De: [email protected] À: [email protected] Envoyé: Lundi 10 Août 2015 20:00:00 Objet: svn commit: r1695142 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Author: ptahchiev Date: Mon Aug 10 18:00:00 2015 New Revision: 1695142 URL: http://svn.apache.org/r1695142 Log: Check for user's provided encoding, and only if it's null then use the encoding of the xml document. Closes [DOXIASITETOOLS-104] Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1695142&r1=1695141&r2=1695142&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Mon Aug 10 18:00:00 2015 @@ -389,7 +389,14 @@ public class DefaultSiteRenderer switch ( parser.getType() ) { case Parser.XML_TYPE: - reader = ReaderFactory.newXmlReader( doc ); + if ( siteContext.getInputEncoding() != null ) + { + reader = ReaderFactory.newReader( doc, siteContext.getInputEncoding() ); + } + else + { + reader = ReaderFactory.newXmlReader( doc ); + } if ( siteContext.isValidate() ) { reader = validate( reader, resource ); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
