morten 01/06/08 05:57:56
Modified: java/src/org/apache/xalan/xsltc/compiler Constants.java
Parser.java
java/src/org/apache/xalan/xsltc/runtime DefaultRun.java
Log:
A few more changes to make sure the parsers used are namespace aware.
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.5 +4 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java 2001/06/06 10:44:47 1.4
+++ Constants.java 2001/06/08 12:57:52 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Constants.java,v 1.4 2001/06/06 10:44:47 morten Exp $
+ * @(#)$Id: Constants.java,v 1.5 2001/06/08 12:57:52 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -86,6 +86,9 @@
public final int WARNING = 4;
public static final String EMPTYSTRING = "";
+
+ public static final String NAMESPACE_FEATURE =
+ "http://xml.org/sax/features/namespaces";;
public static final String TRANSLET_INTF
= "org.apache.xalan.xsltc.Translet";
1.10 +7 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Parser.java 2001/06/08 12:12:45 1.9
+++ Parser.java 2001/06/08 12:57:52 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Parser.java,v 1.9 2001/06/08 12:12:45 morten Exp $
+ * @(#)$Id: Parser.java,v 1.10 2001/06/08 12:57:52 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -373,7 +373,12 @@
try {
// Create a SAX parser and get the XMLReader object it uses
final SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setFeature("http://xml.org/sax/features/namespaces",true);
+ try {
+ factory.setFeature(Constants.NAMESPACE_FEATURE,true);
+ }
+ catch (Exception e) {
+ factory.setNamespaceAware(true);
+ }
final SAXParser parser = factory.newSAXParser();
final XMLReader reader = parser.getXMLReader();
1.7 +8 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultRun.java
Index: DefaultRun.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultRun.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultRun.java 2001/06/08 12:12:53 1.6
+++ DefaultRun.java 2001/06/08 12:57:55 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DefaultRun.java,v 1.6 2001/06/08 12:12:53 morten Exp $
+ * @(#)$Id: DefaultRun.java,v 1.7 2001/06/08 12:57:55 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -82,6 +82,7 @@
import org.apache.xalan.xsltc.dom.DOMImpl;
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.dom.DTDMonitor;
+import org.apache.xalan.xsltc.compiler.Constants;
final public class DefaultRun {
@@ -126,7 +127,12 @@
// Create a SAX parser and get the XMLReader object it uses
final SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setFeature("http://xml.org/sax/features/namespaces",true);
+ try {
+ factory.setFeature(Constants.NAMESPACE_FEATURE,true);
+ }
+ catch (Exception e) {
+ factory.setNamespaceAware(true);
+ }
final SAXParser parser = factory.newSAXParser();
final XMLReader reader = parser.getXMLReader();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
