Re: svn commit: r630215 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java

[Max Berger]

Jeremias,

this should do it. Although it restricts XInclude processing to xerces
based parsers. However, that should not be a problem since xerces is
shipped with fop anyways.

Please note that at I was not able to test with a real 1.4 JDK though.

Max

On Fre, 2008-02-22 at 14:17 +, [EMAIL PROTECTED] wrote:
 Author: maxberger
 Date: Fri Feb 22 06:17:20 2008
 New Revision: 630215
 
 URL: http://svn.apache.org/viewvc?rev=630215view=rev
 Log:
 Fixed backward compatiblity with 1.4
 
 Modified:
 xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
 
 Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
 URL: 
 http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java?rev=630215r1=630214r2=630215view=diff
 ==
 --- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java 
 (original)
 +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java Fri 
 Feb 22 06:17:20 2008
 @@ -151,8 +151,8 @@
  InputSource is = new InputSource(new FileInputStream(
  this.sarg1ourcefile));
  SAXParserFactory spf = SAXParserFactory.newInstance();
 -spf.setNamespaceAware(true);
 -spf.setXIncludeAware(true);
 +spf.setFeature(http://xml.org/sax/features/namespaces;, true);
 +spf.setFeature(http://apache.org/xml/features/xinclude;, true);
  XMLReader xr = spf.newSAXParser().getXMLReader();
  result = new SAXSource(xr, is);
  } catch (SAXException e) {
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
mfG

Max Berger
e-mail: [EMAIL PROTECTED]

-- 
OpenPG ID: E81592BC   Print: F489F8759D4132923EC4 BC7E072AB73AE81592BC
For information about me and my work please see http://max.berger.name



signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil

Re: svn commit: r630215 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java

[Jeremias Maerki]

Sorry, Max, but it's not that simple. The GNU or Oracle XML parser will
throw a SAXNotRecognizedException here.

On 22.02.2008 15:17:20 maxberger wrote:
 Author: maxberger
 Date: Fri Feb 22 06:17:20 2008
 New Revision: 630215
 
 URL: http://svn.apache.org/viewvc?rev=630215view=rev
 Log:
 Fixed backward compatiblity with 1.4
 
 Modified:
 xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
 
 Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
 URL: 
 http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java?rev=630215r1=630214r2=630215view=diff
 ==
 --- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java 
 (original)
 +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java Fri 
 Feb 22 06:17:20 2008
 @@ -151,8 +151,8 @@
  InputSource is = new InputSource(new FileInputStream(
  this.sourcefile));
  SAXParserFactory spf = SAXParserFactory.newInstance();
 -spf.setNamespaceAware(true);
 -spf.setXIncludeAware(true);
 +spf.setFeature(http://xml.org/sax/features/namespaces;, true);
 +spf.setFeature(http://apache.org/xml/features/xinclude;, true);
  XMLReader xr = spf.newSAXParser().getXMLReader();
  result = new SAXSource(xr, is);
  } catch (SAXException e) {
 
 



Jeremias Maerki

Re: svn commit: r630215 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java

[Max Berger]

Jeremias,

which is taken care of, as this is a subclass of SAXException. In this
case the old behavior will be triggered. 

...
   } catch (SAXException e) {
result = new StreamSource(this.sourcefile);
} catch (IOException e) {
...

Max

On Fre, 2008-02-22 at 15:24 +0100, Jeremias Maerki wrote:
 Sorry, Max, but it's not that simple. The GNU or Oracle XML parser will
 throw a SAXNotRecognizedException here.
 
 On 22.02.2008 15:17:20 maxberger wrote:
  Author: maxberger
  Date: Fri Feb 22 06:17:20 2008
  New Revision: 630215
  
  URL: http://svn.apache.org/viewvc?rev=630215view=rev
  Log:
  Fixed backward compatiblity with 1.4
  
  Modified:
  xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
  
  Modified: 
  xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
  URL: 
  http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java?rev=630215r1=630214r2=630215view=diff
  ==
  --- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java 
  (original)
  +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java Fri 
  Feb 22 06:17:20 2008
  @@ -151,8 +151,8 @@
   InputSource is = new InputSource(new FileInputStream(
   this.sourcefile));
   SAXParserFactory spf = SAXParserFactory.newInstance();
  -spf.setNamespaceAware(true);
  -spf.setXIncludeAware(true);
  +spf.setFeature(http://xml.org/sax/features/namespaces;, true);
  +spf.setFeature(http://apache.org/xml/features/xinclude;, 
  true);
   XMLReader xr = spf.newSAXParser().getXMLReader();
   result = new SAXSource(xr, is);
   } catch (SAXException e) {
  
  
 
 
 
 Jeremias Maerki
 
mfG

Max Berger
e-mail: [EMAIL PROTECTED]

-- 
OpenPG ID: E81592BC   Print: F489F8759D4132923EC4 BC7E072AB73AE81592BC
For information about me and my work please see http://max.berger.name



signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil