dims 01/04/20 07:48:33
Modified: src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 Logicsheet.java
LogicsheetCodeGenerator.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
TraxTransformer.java
Added: src/org/apache/cocoon/util Tag: xml-cocoon2
TraxErrorHandler.java
Log:
Added Error Handler for logging TRaX problems.
Revision Changes Path
No revision
No revision
1.1.2.15 +7 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Logicsheet.java 2001/04/12 21:12:36 1.1.2.14
+++ Logicsheet.java 2001/04/20 14:48:26 1.1.2.15
@@ -38,6 +38,8 @@
import javax.xml.transform.sax.SAXTransformerFactory;
import org.apache.avalon.AbstractLoggable;
+import org.apache.cocoon.util.TraxErrorHandler;
+
/**
* A code-generation logicsheet. This class is actually a wrapper for
* a "standard" XSLT stylesheet stored as <code>trax.Templates</code> object.
@@ -46,7 +48,7 @@
* transformed into an equivalent XSLT stylesheet anyway... This class
should probably be based on an interface...
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/12 21:12:36 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 14:48:26 $
*/
public class Logicsheet extends AbstractLoggable {
/** The trax TransformerFactory */
@@ -78,7 +80,7 @@
public void setInputSource(InputSource inputSource) throws SAXException,
IOException {
try {
tfactory =
(SAXTransformerFactory)TransformerFactory.newInstance();
- //templates = tfactory.newTemplates(new SAXSource(inputSource));
+ tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
// Create a Templates ContentHandler to handle parsing of the
// stylesheet.
@@ -114,7 +116,9 @@
*/
public TransformerHandler getTransformerHandler() {
try {
- return tfactory.newTransformerHandler(templates);
+ TransformerHandler handler =
tfactory.newTransformerHandler(templates);
+ handler.getTransformer().setErrorListener(new
TraxErrorHandler(getLogger()));
+ return handler;
} catch (TransformerConfigurationException e) {
getLogger().error("Logicsheet.getTransformerHandler:TransformerConfigurationException",
e);
} catch (Exception e) {
1.1.2.13 +5 -1
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java
Index: LogicsheetCodeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- LogicsheetCodeGenerator.java 2001/02/20 21:06:43 1.1.2.12
+++ LogicsheetCodeGenerator.java 2001/04/20 14:48:27 1.1.2.13
@@ -30,12 +30,14 @@
import org.apache.log.Logger;
import org.apache.avalon.Loggable;
+import org.apache.cocoon.util.TraxErrorHandler;
+
/**
* A logicsheet-based implementation of <code>MarkupCodeGenerator</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/20 21:06:43 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 14:48:27 $
*/
public class LogicsheetCodeGenerator implements MarkupCodeGenerator,
Loggable {
@@ -57,6 +59,7 @@
public LogicsheetCodeGenerator() {
SAXTransformerFactory factory = (SAXTransformerFactory)
TransformerFactory.newInstance();
+ factory.setErrorListener(new TraxErrorHandler(log));
Properties format = new Properties();
try {
@@ -64,6 +67,7 @@
// FIXME (SSA) change a home made content handler, that extract
the PCDATA
// from the last remaining element
TransformerHandler handler = factory.newTransformerHandler();
+ handler.getTransformer().setErrorListener(new
TraxErrorHandler(log));
// Set the output properties
format.put(OutputKeys.METHOD,"text");
No revision
No revision
1.1.2.22 +10 -4
xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- TraxTransformer.java 2001/04/17 18:18:55 1.1.2.21
+++ TraxTransformer.java 2001/04/20 14:48:30 1.1.2.22
@@ -44,6 +44,7 @@
import org.apache.cocoon.caching.CompositeCacheValidity;
import org.apache.cocoon.caching.ParametersCacheValidity;
import org.apache.cocoon.util.HashUtil;
+import org.apache.cocoon.util.TraxErrorHandler;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.ContentHandlerWrapper;
@@ -60,7 +61,6 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.TransformerException;
/**
*
@@ -68,7 +68,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/17 18:18:55 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/20 14:48:30 $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Recyclable, Configurable, Cacheable,
Disposable {
@@ -81,7 +81,7 @@
private Browser browser = null;
/** The trax TransformerFactory */
- private SAXTransformerFactory tfactory = (SAXTransformerFactory)
TransformerFactory.newInstance();
+ private SAXTransformerFactory tfactory = null;
/** The trax TransformerHandler */
private TransformerHandler transformerHandler = null;
@@ -131,6 +131,10 @@
}
if(templates == null)
{
+ if(tfactory == null) {
+ tfactory = (SAXTransformerFactory)
TransformerFactory.newInstance();
+ tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
+ }
templates = tfactory.newTemplates(new SAXSource(new
InputSource(systemID)));
if (this.useStore == true)
{
@@ -146,7 +150,9 @@
}
}
}
- return tfactory.newTransformerHandler(templates);
+ TransformerHandler handler =
tfactory.newTransformerHandler(templates);
+ handler.getTransformer().setErrorListener(new
TraxErrorHandler(getLogger()));
+ return handler;
}
/**
No revision
No revision
1.1.2.1 +64 -0
xml-cocoon/src/org/apache/cocoon/util/Attic/TraxErrorHandler.java
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
