dims 01/02/23 06:01:28
Modified: src/org/apache/cocoon Tag: xml-cocoon2
ProcessingException.java
src/org/apache/cocoon/environment Tag: xml-cocoon2
AbstractEnvironment.java
src/org/apache/cocoon/environment/commandline Tag:
xml-cocoon2 FileSavingEnvironment.java
LinkSamplingEnvironment.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
FileGenerator.java HTMLGenerator.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
ResourceReader.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
ResourcePipeline.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
TraxTransformer.java XIncludeTransformer.java
XTTransformer.java
Log:
Better support for logging Embedded/Cascading exceptions.
Revision Changes Path
No revision
No revision
1.1.2.8 +27 -1
xml-cocoon/src/org/apache/cocoon/Attic/ProcessingException.java
Index: ProcessingException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ProcessingException.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ProcessingException.java 2001/02/05 16:23:03 1.1.2.7
+++ ProcessingException.java 2001/02/23 14:01:25 1.1.2.8
@@ -7,6 +7,9 @@
*****************************************************************************/
package org.apache.cocoon;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
import org.apache.avalon.CascadingException;
/**
@@ -15,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/05 16:23:03 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/23 14:01:25 $
*/
public class ProcessingException extends CascadingException {
@@ -32,5 +35,28 @@
*/
public ProcessingException(String message, Throwable t) {
super(message, t);
+ }
+
+ public String toString() {
+ StringBuffer s = new StringBuffer();
+ s.append(super.toString());
+ s.append(':');
+ s.append(getCause().toString());
+ return s.toString();
+ }
+
+ public void printStackTrace() {
+ super.printStackTrace();
+ getCause().printStackTrace();
+ }
+
+ public void printStackTrace( PrintStream s ) {
+ super.printStackTrace(s);
+ getCause().printStackTrace(s);
+ }
+
+ public void printStackTrace( PrintWriter s ) {
+ super.printStackTrace(s);
+ getCause().printStackTrace(s);
}
}
No revision
No revision
1.1.2.11 +6 -4
xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractEnvironment.java 2001/02/21 12:17:05 1.1.2.10
+++ AbstractEnvironment.java 2001/02/23 14:01:26 1.1.2.11
@@ -27,6 +27,8 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.apache.log.LogKit;
+
public abstract class AbstractEnvironment extends AbstractLoggable
implements Environment {
/** The current uri in progress */
@@ -97,9 +99,9 @@
*/
public void changeContext(String prefix, String context)
throws MalformedURLException {
- getLogger().debug("Changing Cocoon context(" + context + ") to
prefix(" + prefix + ")");
- getLogger().debug("\tfrom context(" + this.context.toExternalForm()
+ ") and prefix(" + this.prefix + ")");
- getLogger().debug("\tat URI " + uri);
+ LogKit.getLoggerFor("cocoon").debug("Changing Cocoon context(" +
context + ") to prefix(" + prefix + ")");
+ LogKit.getLoggerFor("cocoon").debug("\tfrom context(" +
this.context.toExternalForm() + ") and prefix(" + this.prefix + ")");
+ LogKit.getLoggerFor("cocoon").debug("\tat URI " + uri);
if (uri.startsWith(prefix)) {
this.prefix.append(prefix);
uri = uri.substring(prefix.length());
@@ -128,7 +130,7 @@
+ prefix + ")"
);
}
- getLogger().debug("New context is " + this.context.toExternalForm());
+ LogKit.getLoggerFor("cocoon").debug("New context is " +
this.context.toExternalForm());
}
/**
No revision
No revision
1.1.2.12 +4 -2
xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/FileSavingEnvironment.java
Index: FileSavingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/FileSavingEnvironment.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FileSavingEnvironment.java 2001/02/15 20:29:23 1.1.2.11
+++ FileSavingEnvironment.java 2001/02/23 14:01:26 1.1.2.12
@@ -20,11 +20,13 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.AbstractEnvironment;
+import org.apache.log.LogKit;
+
/**
* This environment is used to save the requested file to disk.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/15 20:29:23 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/23 14:01:26 $
*/
public class FileSavingEnvironment extends AbstractCommandLineEnvironment {
@@ -32,7 +34,7 @@
public FileSavingEnvironment(String uri, File context, Map attributes,
Map parameters, Map links, OutputStream stream)
throws MalformedURLException {
super(uri, null, context, stream);
- getLogger().debug("FileSavingEnvironment: uri=" + uri);
+ LogKit.getLoggerFor("cocoon").debug("FileSavingEnvironment: uri=" +
uri);
this.objectModel.put(Constants.LINK_OBJECT, links);
this.objectModel.put(Constants.REQUEST_OBJECT, new
CommandLineRequest(null, uri, null, attributes, parameters));
this.objectModel.put(Constants.RESPONSE_OBJECT, new
CommandLineResponse());
1.1.2.12 +3 -2
xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/LinkSamplingEnvironment.java
Index: LinkSamplingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/LinkSamplingEnvironment.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- LinkSamplingEnvironment.java 2001/02/15 20:29:25 1.1.2.11
+++ LinkSamplingEnvironment.java 2001/02/23 14:01:26 1.1.2.12
@@ -29,12 +29,13 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.AbstractEnvironment;
+import org.apache.log.LogKit;
/**
* This environment is sample the links of the resource.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/15 20:29:25 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/23 14:01:26 $
*/
public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment {
@@ -44,7 +45,7 @@
public LinkSamplingEnvironment(String uri, File contextFile, Map
attributes, Map parameters)
throws MalformedURLException, IOException {
super(uri, Constants.LINK_VIEW, contextFile, new
ByteArrayOutputStream());
- getLogger().debug("LinkSamplingEnvironment: uri=" + uri);
+ LogKit.getLoggerFor("cocoon").debug("LinkSamplingEnvironment: uri="
+ uri);
this.objectModel.put(Constants.REQUEST_OBJECT, new
CommandLineRequest(null, uri, null, attributes, parameters));
this.objectModel.put(Constants.RESPONSE_OBJECT, new
CommandLineResponse());
}
No revision
No revision
1.1.2.22 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- FileGenerator.java 2001/02/22 19:08:02 1.1.2.21
+++ FileGenerator.java 2001/02/23 14:01:26 1.1.2.22
@@ -59,7 +59,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/02/22 19:08:02 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/02/23 14:01:26 $
*/
public class FileGenerator extends ComposerGenerator implements Poolable,
Configurable {
@@ -181,7 +181,7 @@
throw(e);
} catch (Exception e){
getLogger().error("Could not get parser", e);
- throw new ProcessingException(e.getMessage());
+ throw new ProcessingException("Exception in
FileGenerator.generate()",e);
}
}
}
1.1.2.14 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- HTMLGenerator.java 2001/02/22 19:08:04 1.1.2.13
+++ HTMLGenerator.java 2001/02/23 14:01:27 1.1.2.14
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/22 19:08:04 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/23 14:01:27 $
*/
public class HTMLGenerator extends ComposerGenerator implements Poolable {
@@ -60,7 +60,7 @@
throw(e);
} catch (Exception e){
getLogger().error("Could not get parser", e);
- throw new ProcessingException(e.getMessage());
+ throw new ProcessingException("Exception in
HTMLGenerator.generate()",e);
}
}
}
No revision
No revision
1.1.2.19 +2 -2
xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- ResourceReader.java 2001/02/22 19:08:07 1.1.2.18
+++ ResourceReader.java 2001/02/23 14:01:27 1.1.2.19
@@ -37,7 +37,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/22 19:08:07 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/23 14:01:27 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
@@ -73,7 +73,7 @@
urlFactory = (URLFactory) this.manager.lookup(Roles.URL_FACTORY);
} catch (Exception e) {
getLogger().error("cannot obtain the URLFactory", e);
- throw new ProcessingException ("cannot obtain the URLFactory");
+ throw new ProcessingException ("cannot obtain the URLFactory",
e);
}
if (res == null) {
No revision
No revision
1.1.2.24 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java
Index: ResourcePipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- ResourcePipeline.java 2001/02/22 19:08:12 1.1.2.23
+++ ResourcePipeline.java 2001/02/23 14:01:27 1.1.2.24
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/02/22 19:08:12 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/02/23 14:01:27 $
*/
public class ResourcePipeline implements Composer {
private Generator generator;
@@ -200,7 +200,7 @@
producer.setConsumer (this.serializer);
this.generator.generate();
} catch (Exception e) {
- throw new ProcessingException("Error generating the
resource");
+ throw new ProcessingException("Error generating the
resource", e);
} finally {
((ComponentSelector)
this.manager.lookup(Roles.GENERATORS)).release((Component) generator);
No revision
No revision
1.1.2.9 +2 -2
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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- TraxTransformer.java 2001/02/22 17:10:56 1.1.2.8
+++ TraxTransformer.java 2001/02/23 14:01:27 1.1.2.9
@@ -58,7 +58,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.8 $ $Date: 2001/02/22 17:10:56 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/23 14:01:27 $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable, Recyclable, Configurable {
@@ -174,7 +174,7 @@
transformerHandler = getTransformerHandler(resolver,xsluri);
} catch (TransformerConfigurationException e){
log.error("Problem in getTransformer:", e);
- throw new ProcessingException("Problem in getTransformer:" +
e.getMessage());
+ throw new ProcessingException("Problem in getTransformer:" +
e.getMessage(), e);
}
if (request != null) {
1.1.2.21 +2 -2
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- XIncludeTransformer.java 2001/02/22 19:08:19 1.1.2.20
+++ XIncludeTransformer.java 2001/02/23 14:01:28 1.1.2.21
@@ -49,7 +49,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/02/22 19:08:19 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/02/23 14:01:28 $ $Author:
dims $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composer, Poolable {
@@ -93,7 +93,7 @@
getLogger().debug("SOURCE URI: "+base_xmlbase_uri.toString());
} catch (MalformedURLException e) {
getLogger().debug("XincludeTransformer", e);
- throw new ProcessingException(e.getMessage());
+ throw new ProcessingException(e.getMessage(), e);
}
}
*/
1.1.2.15 +2 -2
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- XTTransformer.java 2001/02/22 19:08:20 1.1.2.14
+++ XTTransformer.java 2001/02/23 14:01:28 1.1.2.15
@@ -71,7 +71,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/22 19:08:20 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/02/23 14:01:28 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composer, Loggable, Poolable {
@@ -149,7 +149,7 @@
saxParser = SAXParserFactory.newInstance().newSAXParser();
} catch (ParserConfigurationException e) {
log.error("XTTransformer.setup", e);
- new ProcessingException(e.getMessage());
+ new ProcessingException(e.getMessage(),e);
}
loaderprocessor.setParser(saxParser.getParser());
InputSource xslsrc = resolver.resolveEntity(null, xsluri);
