cziegeler 2003/01/15 02:39:35
Modified: src/documentation cocoon.xconf
src/java/org/apache/cocoon Constants.java cocoon.roles
src/scratchpad/src/org/apache/cocoon/generation
XPathDirectoryGenerator.java
src/java/org/apache/cocoon/components/deli DeliImpl.java
src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
SourceWritingTransformer.java
CIncludeTransformer.java
src/webapp/WEB-INF cocoon.xconf
src/scratchpad/src/org/apache/cocoon/components/source/impl
XPathSourceInspector.java
src/scratchpad/src/org/apache/cocoon/components/axis
SoapServerImpl.java
lib jars.xml
Added: lib/core excalibur-xmlutil-20030115.jar
Removed: lib/core excalibur-xmlutil-20030114.jar
Log:
Updating to latest excalibur xmlizer
Revision Changes Path
1.19 +2 -2 xml-cocoon2/src/documentation/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/cocoon.xconf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cocoon.xconf 14 Jan 2003 10:04:23 -0000 1.18
+++ cocoon.xconf 15 Jan 2003 10:39:34 -0000 1.19
@@ -67,8 +67,8 @@
<!-- The XMLizer converts different mime-types to XML -->
<xmlizer>
- <component-instance class="org.apache.excalibur.xmlizer.impl.TextXMLizer"
name="text/xml"/>
- <component-instance class="org.apache.excalibur.xmlizer.impl.HTMLXMLizer"
name="text/html"/>
+ <parser role="org.apache.excalibur.xml.sax.Parser/HTML"
mime-type="text/html"/>
+ <parser role="org.apache.excalibur.xml.sax.Parser" mime-type="text/xml"/>
</xmlizer>
<!-- Program Generator -->
1.15 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Constants.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Constants.java 14 Jan 2003 10:04:24 -0000 1.14
+++ Constants.java 15 Jan 2003 10:39:34 -0000 1.15
@@ -141,7 +141,7 @@
String PARSER_PROPERTY = "org.apache.excalibur.xml.sax.Parser";
/** The name of the class for the default XML parser to use */
- String DEFAULT_PARSER = "org.apache.excalibur.xml.sax.JaxpParser";
+ String DEFAULT_PARSER = "org.apache.excalibur.xml.impl.JaxpParser";
/** The name of the property holding the class for a XML parser
* @deprecated This will be removed in future release */
1.43 +25 -3 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cocoon.roles 14 Jan 2003 09:29:28 -0000 1.42
+++ cocoon.roles 15 Jan 2003 10:39:34 -0000 1.43
@@ -14,17 +14,39 @@
<role-list>
+
+ <!-- Parser:
+
+ Starting with Cocoon 2.1 we have a bunch of different parser:
+ - a SAX parser (producing SAX events)
+ - a DOM parser (producint a document)
+ - an HTML parser (producing SAX events from an HTML document)
+ ...
+ -->
+
+ <!-- This is the usual SAX parser -->
<role name="org.apache.excalibur.xml.sax.Parser"
shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.sax.JaxpParser"/>
+ default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
- <role name="org.apache.excalibur.xml.dom.Parser"
+ <!-- This is the usual SAX parser -->
+ <role name="org.apache.excalibur.xml.dom.DOMParser"
shorthand="dom-parser"
- default-class="org.apache.excalibur.xml.sax.JaxpParser"/>
+ default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
+
+ <!-- This is the HTML parser -->
+ <role name="org.apache.excalibur.xml.sax.Parser/HTML"
+ shorthand="html-parser"
+ default-class="org.apache.excalibur.xml.sax.JTidyHTMLParser"/>
+ <!-- The entity resolver used by most parsers -->
<role name="org.apache.excalibur.xml.EntityResolver"
shorthand="entity-resolver"
default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
+
+
+ <!-- XSLT:
+ -->
<role name="org.apache.avalon.excalibur.xml.xslt.XSLTProcessor"
shorthand="xslt-processor"
1.9 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Index: XPathDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathDirectoryGenerator.java 14 Jan 2003 09:29:28 -0000 1.8
+++ XPathDirectoryGenerator.java 15 Jan 2003 10:39:34 -0000 1.9
@@ -57,7 +57,7 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -115,7 +115,7 @@
protected static final String CDATA = "CDATA";
protected String XPathQuery = null;
protected XPathProcessor processor = null;
- protected Parser parser;
+ protected DOMParser parser;
protected Document doc;
public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters par)
@@ -136,7 +136,7 @@
try {
super.compose(manager);
processor = (XPathProcessor)manager.lookup(XPathProcessor.ROLE);
- parser = (Parser)manager.lookup(Parser.ROLE);
+ parser = (DOMParser)manager.lookup(DOMParser.ROLE);
} catch (Exception e) {
this.getLogger().error("Could not obtain a required component", e);
}
1.23 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DeliImpl.java 14 Jan 2003 09:29:28 -0000 1.22
+++ DeliImpl.java 15 Jan 2003 10:39:34 -0000 1.23
@@ -69,7 +69,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -123,7 +123,7 @@
protected ComponentManager manager = null;
/** Parser used to construct the DOM tree to import the profile to a stylesheet
*/
- protected Parser parser;
+ protected DOMParser parser;
/** A context, used to retrieve the path to the configuration file */
protected CocoonServletContext servletContext;
@@ -140,7 +140,7 @@
throws ComponentException {
this.manager = manager;
try {
- this.parser = (Parser)this.manager.lookup(Parser.ROLE);
+ this.parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
} catch (ComponentException e) {
getLogger().error("DELI Exception while creating parser: ", e);
throw e;
1.1 xml-cocoon2/lib/core/excalibur-xmlutil-20030115.jar
<<Binary file>>
1.15 +7 -6
xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XIncludeTransformer.java 14 Jan 2003 09:54:19 -0000 1.14
+++ XIncludeTransformer.java 15 Jan 2003 10:39:34 -0000 1.15
@@ -64,7 +64,8 @@
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
@@ -297,9 +298,9 @@
InputSource input = SourceUtil.getInputSource(url);
if (suffix.startsWith("xpointer(") && suffix.endsWith(")")) {
- Parser parser = null;
+ DOMParser parser = null;
try {
- parser = (Parser)manager.lookup(Parser.ROLE);
+ parser = (DOMParser)manager.lookup(DOMParser.ROLE);
String xpath = suffix.substring(9,suffix.length()-1);
getLogger().debug("XPath is "+xpath);
Document document = parser.parseDocument(input);
@@ -313,9 +314,9 @@
this.manager.release((Component)parser);
}
} else {
- org.apache.excalibur.xml.sax.Parser parser = null;
+ Parser parser = null;
try {
- parser =
(org.apache.excalibur.xml.sax.Parser)manager.lookup(org.apache.excalibur.xml.sax.Parser.ROLE);
+ parser = (Parser)manager.lookup(Parser.ROLE);
IncludeXMLConsumer xinclude_handler = new
IncludeXMLConsumer(super.contentHandler,super.lexicalHandler);
parser.parse(input, xinclude_handler);
} finally {
1.13 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
Index: SourceWritingTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SourceWritingTransformer.java 14 Jan 2003 09:54:19 -0000 1.12
+++ SourceWritingTransformer.java 15 Jan 2003 10:39:34 -0000 1.13
@@ -67,7 +67,7 @@
import org.apache.cocoon.xml.dom.DOMUtil;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -653,7 +653,7 @@
if (overwrite == true) {
if (parent.getNodeType() == Node.DOCUMENT_NODE) {
// replacing of the document element is not
allowed
- Parser parser =
(Parser)this.manager.lookup(Parser.ROLE);
+ DOMParser parser =
(DOMParser)this.manager.lookup(DOMParser.ROLE);
try {
resource = parser.createDocument();
} finally {
@@ -692,7 +692,7 @@
parent.appendChild(importNode);
}
} else if (create == true) {
- Parser parser = (Parser)this.manager.lookup(Parser.ROLE);
+ DOMParser parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
try {
resource = parser.createDocument();
} finally {
1.18 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CIncludeTransformer.java 14 Jan 2003 09:54:19 -0000 1.17
+++ CIncludeTransformer.java 15 Jan 2003 10:39:34 -0000 1.18
@@ -62,7 +62,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -359,11 +359,11 @@
if (!"".equals(select)) {
- Parser parser = null;
+ DOMParser parser = null;
XPathProcessor processor = null;
try {
- parser = (Parser)this.manager.lookup(Parser.ROLE);
+ parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
processor =
(XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
InputSource input = SourceUtil.getInputSource(source);
1.55 +6 -6 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cocoon.xconf 14 Jan 2003 10:15:22 -0000 1.54
+++ cocoon.xconf 15 Jan 2003 10:39:34 -0000 1.55
@@ -13,21 +13,21 @@
<!-- ===================== General Components =========================== -->
- <xml-parser class="org.apache.excalibur.xml.sax.JaxpParser"
+ <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
logger="core.xml-parser" pool-grow="4" pool-max="32" pool-min="8">
<!-- Parser:
The default parser used in Apache Cocoon is
- org.apache.excalibur.xml.sax.JaxpParser. Apache Cocoon requires a
+ org.apache.excalibur.xml.impl.JaxpParser. Apache Cocoon requires a
JAXP 1.1 parser.
If you have problems because your servlet environment uses its own
parser not conforming to JAXP 1.1 try using the alternative
XercesParser instead of the JaxpParser. To activate the XercesParser,
change the class attribute to
- class="org.apache.excalibur.xml.sax.XercesParser"
+ class="org.apache.excalibur.xml.impl.XercesParser"
You will also need to add a system property to your JVM,
probably on the startup of your servlet engine like this:
- -Dorg.apache.excalibur.xml.sax.Parser=org.apache.excalibur.xml.sax.XercesParser
+ -Dorg.apache.excalibur.xml.sax.Parser=org.apache.excalibur.xml.impl.XercesParser
Configuration for the JaxpParser (not the XercesParser!):
- validate (boolean, default = false): This parameter causes the parser
@@ -165,8 +165,8 @@
<!-- The XMLizer converts different mime-types to XML -->
<xmlizer>
- <component-instance class="org.apache.excalibur.xmlizer.impl.TextXMLizer"
name="text/xml"/>
- <component-instance class="org.apache.excalibur.xmlizer.impl.HTMLXMLizer"
name="text/html"/>
+ <parser role="org.apache.excalibur.xml.sax.Parser/HTML"
mime-type="text/html"/>
+ <parser role="org.apache.excalibur.xml.sax.Parser" mime-type="text/xml"/>
</xmlizer>
<!-- Program Generator:
1.7 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java
Index: XPathSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathSourceInspector.java 14 Jan 2003 09:29:29 -0000 1.6
+++ XPathSourceInspector.java 15 Jan 2003 10:39:34 -0000 1.7
@@ -67,7 +67,7 @@
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -109,10 +109,10 @@
if ((namespace.equals(propertynamespace)) && (name.equals(propertyname)) &&
(source.getSystemId().endsWith(extension))) {
- Parser parser = null;
+ DOMParser parser = null;
Document doc = null;
try {
- parser = (Parser)manager.lookup(Parser.ROLE);
+ parser = (DOMParser)manager.lookup(DOMParser.ROLE);
doc = parser.parseDocument(new
InputSource(source.getInputStream()));
} catch (SAXException se) {
1.7 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/axis/SoapServerImpl.java
Index: SoapServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/axis/SoapServerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SoapServerImpl.java 14 Jan 2003 09:29:29 -0000 1.6
+++ SoapServerImpl.java 15 Jan 2003 10:39:35 -0000 1.7
@@ -100,7 +100,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.excalibur.xml.dom.Parser;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -400,13 +400,13 @@
if (m != null)
{
SourceResolver resolver = null;
- Parser parser = null;
+ DOMParser parser = null;
try
{
final Configuration[] services = m.getChildren("descriptor");
resolver = (SourceResolver) m_manager.lookup(SourceResolver.ROLE);
- parser = (Parser) m_manager.lookup(Parser.ROLE);
+ parser = (DOMParser) m_manager.lookup(DOMParser.ROLE);
for (int i = 0; i < services.length; ++i)
{
1.66 +1 -1 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- jars.xml 14 Jan 2003 08:32:01 -0000 1.65
+++ jars.xml 15 Jan 2003 10:39:35 -0000 1.66
@@ -171,7 +171,7 @@
<description>Part of jakarta-avalon, it is a set of classes and patterns that
support high level server development.</description>
<used-by>Cocoon</used-by>
- <lib>core/excalibur-xmlutil-20030114.jar</lib>
+ <lib>core/excalibur-xmlutil-20030115.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
