You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/01/26 19:04:16 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/processor StylesheetHandler.java XSLTElementDef.java XSLTSchema.java
sboag 01/01/26 10:04:15
Modified: java/src/org/apache/xalan/processor StylesheetHandler.java
XSLTElementDef.java XSLTSchema.java
Log:
Fixed problem with non-namespaced elements being allowed as
children of the stylesheet.
Revision Changes Path
1.34 +3 -2 xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java
Index: StylesheetHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- StylesheetHandler.java 2001/01/26 13:56:15 1.33
+++ StylesheetHandler.java 2001/01/26 18:04:12 1.34
@@ -400,9 +400,10 @@
XSLTElementProcessor elemProcessor = def.getProcessorFor(uri, localName);
if (null == elemProcessor
- && (null == getStylesheet()
+ && ((null == getStylesheet()
|| Double.valueOf(getStylesheet().getVersion()).doubleValue()
- > Constants.XSLTVERSUPPORTED))
+ > Constants.XSLTVERSUPPORTED) ||
+ currentProcessor instanceof ProcessorStylesheetElement))
{
elemProcessor = def.getProcessorForUnknown(uri, localName);
}
1.12 +1 -1 xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java
Index: XSLTElementDef.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSLTElementDef.java 2001/01/26 17:01:46 1.11
+++ XSLTElementDef.java 2001/01/26 18:04:13 1.12
@@ -365,7 +365,7 @@
{
XSLTElementDef def = m_elements[i];
- if (def.m_name.equals("unknown"))
+ if (def.m_name.equals("unknown") && uri.length() > 0)
{
return def.m_elementProcessor;
}
1.17 +2 -2 xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java
Index: XSLTSchema.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XSLTSchema.java 2001/01/26 17:01:47 1.16
+++ XSLTSchema.java 2001/01/26 18:04:13 1.17
@@ -284,7 +284,7 @@
resultAttr }, new ProcessorLRE(),
ElemLiteralResult.class /* class object */);
XSLTElementDef unknownElement =
- new XSLTElementDef(this, null, "unknown", null /*alias */,
+ new XSLTElementDef(this, "*", "unknown", null /*alias */,
templateElementsAndParams /* elements */,
new XSLTAttributeDef[]{ xslExcludeResultPrefixesAttr,
xslExtensionElementPrefixesAttr,
@@ -545,7 +545,7 @@
null /* class object */);
XSLTElementDef[] topLevelElements = new XSLTElementDef[]{ includeDef,
importDef,
- resultElement,
+ // resultElement,
whiteSpaceOnly,
unknownElement,
new XSLTElementDef(