You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2003/04/01 18:33:49 UTC
cvs commit: cocoon-2.1/src/blocks/chaperon/samples sitemap.xmap
stephan 2003/04/01 08:33:49
Modified: src/blocks/chaperon/java/org/apache/cocoon/transformation
LexicalTransformer.java ParserTransformer.java
src/blocks/chaperon/samples sitemap.xmap
Added: src/blocks/chaperon/lib chaperon-20030401.jar
Removed: src/blocks/chaperon/lib chaperon-20030208.jar
Log:
Update to new chaperon parser, which now offers some basic error-recovery
strategies, and improved performance.
Revision Changes Path
1.3 +17 -6 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
Index: LexicalTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LexicalTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
+++ LexicalTransformer.java 1 Apr 2003 16:33:49 -0000 1.3
@@ -73,6 +73,8 @@
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -110,10 +112,7 @@
*/
public class LexicalTransformer extends LexicalProcessorAdapter
implements Transformer, LogEnabled, Composable, Recyclable, Disposable,
- CacheableProcessingComponent {
-
- /** Namespace for the SAX events. */
-/* public final static String NS = "http://apache.org/cocoon/lexemes/1.0";*/
+ Parameterizable, CacheableProcessingComponent {
private XMLConsumer consumer = null;
@@ -126,6 +125,7 @@
private LexicalAutomaton automaton = null;
private LexicalHandlerAdapter adapter = new LexicalHandlerAdapter(true);
+ private boolean recovery = false;
/**
* Provide component with a logger.
@@ -148,6 +148,17 @@
}
/**
+ * Provide component with parameters.
+ *
+ * @param parameters the parameters
+ * @throws ParameterException if parameters are invalid
+ */
+ public void parameterize(Parameters parameters) throws ParameterException {
+
+ recovery = parameters.getParameterAsBoolean("recovery", false);
+ }
+
+ /**
* Set the <code>XMLConsumer</code> that will receive XML data.
*
* @param consumer
@@ -159,7 +170,6 @@
setLexicalHandler(consumer);
adapter.setContentHandler(consumer);
-// adapter.setNamespace(NS);
}
/**
@@ -234,6 +244,7 @@
processor.setLexicalHandler(this.adapter);
processor.setLogger(this.logger);
+ processor.setRecovery(recovery);
setLexicalProcessor(processor);
}
1.3 +4 -4 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
Index: ParserTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
+++ ParserTransformer.java 1 Apr 2003 16:33:49 -0000 1.3
@@ -127,7 +127,7 @@
private ParserAutomaton automaton = null;
private ParserHandlerAdapter adapter = new ParserHandlerAdapter(true);
- private boolean ignoring = false;
+ private boolean recovery = false;
/**
* Provide component with a logger.
@@ -160,7 +160,7 @@
adapter.setFlatten(parameters.getParameterAsBoolean("flatten",
false));
- ignoring = parameters.getParameterAsBoolean("ignoring", false);
+ recovery = parameters.getParameterAsBoolean("recovery", false);
}
/**
@@ -247,7 +247,7 @@
processor.setParserHandler(this.adapter);
processor.setLogger(this.logger);
- processor.setIgnoreUnexpectedLexemes(ignoring);
+ processor.setRecovery(recovery);
setParserProcessor(processor);
}
1.1 cocoon-2.1/src/blocks/chaperon/lib/chaperon-20030401.jar
<<Binary file>>
1.9 +13 -1 cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sitemap.xmap 28 Mar 2003 10:52:27 -0000 1.8
+++ sitemap.xmap 1 Apr 2003 16:33:49 -0000 1.9
@@ -49,7 +49,7 @@
src="org.apache.cocoon.transformation.ParserTransformer"
logger="sitemap.transformer.parser">
<parameter name="flatten" value="true"/>
- <parameter name="ignoring" value="true"/>
+ <parameter name="recovery" value="true"/>
</map:transformer>
</map:transformers>
@@ -203,12 +203,24 @@
<map:match pattern="quote.html">
<map:generate type="text" src="misc/quote.txt"/>
+ <map:transform type="log">
+ <map:parameter name="logfile" value="logfile1.log"/>
+ <map:parameter name="append" value="no"/>
+ </map:transform>
<!--
<map:transform type="lexer" src="cocoon:/quote.xlex"/>
<map:transform type="parser" src="cocoon:/quote.xgrm"/>
-->
<map:transform type="lexer" src="grammars/quote.xlex"/>
+ <map:transform type="log">
+ <map:parameter name="logfile" value="logfile2.log"/>
+ <map:parameter name="append" value="no"/>
+ </map:transform>
<map:transform type="parser" src="grammars/quote.xgrm"/>
+ <map:transform type="log">
+ <map:parameter name="logfile" value="logfile3.log"/>
+ <map:parameter name="append" value="no"/>
+ </map:transform>
<map:transform src="stylesheets/quote2html.xsl"/>
<map:serialize type="html"/>
</map:match>