You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@xalan.apache.org by gg...@apache.org on 2019/04/20 23:31:41 UTC
[xalan-java] 01/01: This commit was manufactured by cvs2svn to
create tag 'jaxp-1_3_0-01'.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to annotated tag jaxp-1_3_0-01
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
commit 250a43e867a1a8739755305c045e5735e0a91e28
Author: No Author <de...@apache.org>
AuthorDate: Fri Aug 8 10:15:45 2003 +0000
This commit was manufactured by cvs2svn to create tag
'jaxp-1_3_0-01'.
---
src/org/apache/xalan/templates/StylesheetRoot.java | 15 ++++++
src/org/apache/xml/utils/DOMBuilder.java | 54 +++++++++++++---------
src/trax/trax.properties | 11 -----
xdocs/sources/xalan/history.xml | 25 ++++++++++
4 files changed, 73 insertions(+), 32 deletions(-)
diff --git a/src/org/apache/xalan/templates/StylesheetRoot.java b/src/org/apache/xalan/templates/StylesheetRoot.java
index 53eda5c..5b258a8 100644
--- a/src/org/apache/xalan/templates/StylesheetRoot.java
+++ b/src/org/apache/xalan/templates/StylesheetRoot.java
@@ -299,6 +299,21 @@ public class StylesheetRoot extends StylesheetComposed
for (int i = recomposableElements.size() - 1; i >= 0; i--)
((ElemTemplateElement) recomposableElements.elementAt(i)).recompose(this);
+/*
+ * Backing out REE again, as it seems to cause some new failures
+ * which need to be investigated. -is
+ */
+ // This has to be done before the initialization of the compose state, because
+ // eleminateRedundentGlobals will add variables to the m_variables vector, which
+ // it then copied in the ComposeState constructor.
+
+// if(true && org.apache.xalan.processor.TransformerFactoryImpl.m_optimize)
+// {
+// RedundentExprEliminator ree = new RedundentExprEliminator();
+// callVisitors(ree);
+// ree.eleminateRedundentGlobals(this);
+// }
+
initComposeState();
// Need final composition of TemplateList. This adds the wild cards onto the chains.
diff --git a/src/org/apache/xml/utils/DOMBuilder.java b/src/org/apache/xml/utils/DOMBuilder.java
index 446f6c9..6e5ffd5 100644
--- a/src/org/apache/xml/utils/DOMBuilder.java
+++ b/src/org/apache/xml/utils/DOMBuilder.java
@@ -1,8 +1,9 @@
/*
* The Apache Software License, Version 1.1
*
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ *zaz
+
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,21 +57,23 @@
*/
package org.apache.xml.utils;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.utils.NodeVector;
import java.util.Stack;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.Attributes;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
+import org.w3c.dom.CDATASection;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.ext.LexicalHandler;
/**
* <meta name="usage" content="general"/>
* This class takes SAX events (in addition to some extra events
@@ -328,15 +331,15 @@ public class DOMBuilder
String attrNS = atts.getURI(i);
- if("".equals(attrNS))
- attrNS = null; // DOM represents no-namespace as null
-
- // System.out.println("attrNS: "+attrNS+", localName: "+atts.getQName(i)
- // +", qname: "+atts.getQName(i)+", value: "+atts.getValue(i));
- // Crimson won't let us set an xmlns: attribute on the DOM.
String attrQName = atts.getQName(i);
- // ALWAYS use the DOM Level 2 call!
- elem.setAttributeNS(attrNS,attrQName, atts.getValue(i));
+ if((attrQName.equals("xmlns") || attrQName.startsWith("xmlns:")) )
+ {
+ elem.setAttributeNS("http://www.w3.org/2000/xmlns/",attrQName, atts.getValue(i));
+ }
+ else
+ {
+ elem.setAttributeNS(atts.getURI(i),attrQName, atts.getValue(i));
+ }
}
}
@@ -426,11 +429,18 @@ public class DOMBuilder
return;
}
-
+
String s = new String(ch, start, length);
- Text text = m_doc.createTextNode(s);
+ Node childNode = m_currentNode.getLastChild();
- append(text);
+ if( childNode != null && childNode.getNodeType() == Node.TEXT_NODE ){
+ ((Text)childNode).appendData(s);
+ }
+ else
+ {
+ Text text = m_doc.createTextNode(s);
+ append(text);
+ }
}
/**
@@ -588,6 +598,7 @@ public class DOMBuilder
public void startCDATA() throws org.xml.sax.SAXException
{
m_inCData = true;
+ append(m_doc.createCDATASection(""));
}
/**
@@ -630,8 +641,9 @@ public class DOMBuilder
return; // avoid DOM006 Hierarchy request error
String s = new String(ch, start, length);
-
- append(m_doc.createCDATASection(s));
+
+ CDATASection section =(CDATASection) m_currentNode.getLastChild();
+ section.appendData(s);
}
/**
diff --git a/src/trax/trax.properties b/src/trax/trax.properties
deleted file mode 100644
index e593c39..0000000
--- a/src/trax/trax.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Revision$ $Date$
-#
-# Note: This properties file is provided for illustrative purposes
-# only and is not part of the interface definition.
-# This properties file is located in the implementation JAR
-# and different implementations will specify different
-# implementation classes and output methods.
-#
-
-# The TRaX Stylesheet processor
-trax.processor.xslt=org.apache.xalan.processor.StylesheetProcessor
diff --git a/xdocs/sources/xalan/history.xml b/xdocs/sources/xalan/history.xml
index 1b5a321..3ba0127 100644
--- a/xdocs/sources/xalan/history.xml
+++ b/xdocs/sources/xalan/history.xml
@@ -209,6 +209,31 @@ Reviewed by: Henry Zongaro
Patch from Christine Li (jycli@ca.ibm.com) for bugzilla #18926.
Variables weren't being cleared from stack between calls to func:function.
+<br/><br/></li>
+<li><ref>Committed by </ref>mkwan@apache.org<ref> on </ref>2003/05/28<br/><ref>Modified: </ref> xml-xalan/java/src/org/apache/xalan/res XSLTErrorResources_ca.java XSLTErrorResources_cs.java XSLTErrorResources_de.java XSLTErrorResources_es.java XSLTErrorResources_fr.java XSLTErrorResources_hu.java XSLTErrorResources_it.java XSLTErrorResources_ja.java XSLTErrorResources_ko.java XSLTErrorResources_pl.java XSLTErrorResources_pt_BR.java XSLTErrorResources_ru.java XSLTErrorResources_sk.java XS [...]
+Checked in localized messages for Xalan and XSLTC contributed by IBM.
+New Locale support includes ca, cs, hu, pl, pt_BR, ru, sk and tr.
+The old messages are also updated with translations for newly added
+English messages.
+<br/><br/></li><li><ref>Committed by </ref>minchau@apache.org<ref> on </ref>2003/05/28<br/><ref>Modified: </ref> xml-xalan/java/src/org/apache/xml/utils BoolStack.java<br/><ref>Committer's log entry: </ref>
+Added a clear() method to clear a BoolStack, so that such a
+stack can be re-used without the need to create a new one
+(for performance).
+Submitted by: Brian Minchau
+<br/><br/></li><li><ref>Committed by </ref>minchau@apache.org<ref> on </ref>2003/05/28<br/><ref>Modified: </ref> xml-xalan/java/src/org/apache/xml/serializer NamespaceMappings.java SerializerBase.java ToHTMLStream.java ToSAXHandler.java ToStream.java ToXMLSAXHandler.java ToXMLStream.java<br/><ref>Committer's log entry: </ref>
+Support for reset() for the stream serializers and for ToXMLSAXHandler.
+These serializers can now be reset and re-used rather than creating a new one.
+A reset() takes about 1/2 the time of creating a new one.
+
+Submitted by: Brian Minchau
+<br/><br/></li><li><ref>Committed by </ref>minchau@apache.org<ref> on </ref>2003/05/28<br/><ref>Modified: </ref> xml-xalan/java/src/org/apache/xml/serializer ToHTMLSAXHandler.java<br/><ref>Committer's log entry: </ref>
+Support for a ToHTMLSAXHandler serializer to be reset() and re-used.
+Submitted by: Brian Minchau
+<br/><br/></li>
+<li><ref>Committed by </ref>grchiu@apache.org<ref> on </ref>2003/05/28<br/><ref>Modified: </ref> xml-xalan/java/xdocs/sources/xalan faq.xml<br/><ref>Committer's log entry: </ref>
+Contributed by Christine Li (jycli@ca.ibm.com).
+Modified FAQ entry regarding bootclasspath; the class path separator is not
+colon for all systems.
<br/><br/></li></ul>
</s2>
<s2 title="Changes for &xslt4j; 2.5.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org