cziegeler 2002/06/04 00:31:53
Modified: src/java/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java Logicsheet.java
src/java/org/apache/cocoon/components/source SourceUtil.java
src/java/org/apache/cocoon/components/source/impl
AvalonToCocoonSource.java CocoonToAvalonSource.java
SitemapSource.java
src/java/org/apache/cocoon/components/xscript
XScriptObjectFromURL.java
src/java/org/apache/cocoon/environment
AbstractEnvironment.java
src/java/org/apache/cocoon/generation FileGenerator.java
HTMLGenerator.java
src/java/org/apache/cocoon/reading ResourceReader.java
src/java/org/apache/cocoon/sitemap ContentAggregator.java
src/java/org/apache/cocoon/transformation
SourceWritingTransformer.java TraxTransformer.java
src/java/org/apache/cocoon/webapps/session/connector
Resource.java ResourceConnectorImpl.java
Log:
Added extra handling of SourceNotFoundException and ResourceNotFoundException
Revision Changes Path
1.18 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractMarkupLanguage.java 6 May 2002 12:28:50 -0000 1.17
+++ AbstractMarkupLanguage.java 4 Jun 2002 07:31:52 -0000 1.18
@@ -69,6 +69,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.store.Store;
import org.apache.cocoon.util.HashMap;
@@ -96,7 +97,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: AbstractMarkupLanguage.java,v 1.17 2002/05/06 12:28:50
cziegeler Exp $
+ * @version CVS $Id: AbstractMarkupLanguage.java,v 1.18 2002/06/04 07:31:52
cziegeler Exp $
*/
public abstract class AbstractMarkupLanguage
extends AbstractLoggable
@@ -440,7 +441,7 @@
logicsheet = new Logicsheet(inputSource, manager, this.resolver);
logicsheetCache.store(CACHE_PREFIX + logicsheet.getSystemId(),
logicsheet);
} catch (SourceException se) {
- throw new ProcessingException(se);
+ throw SourceUtil.handle(se);
} finally {
this.resolver.release( inputSource );
}
1.13 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Logicsheet.java 2 May 2002 12:09:21 -0000 1.12
+++ Logicsheet.java 4 Jun 2002 07:31:52 -0000 1.13
@@ -60,6 +60,7 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceUtil;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -86,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: Logicsheet.java,v 1.12 2002/05/02 12:09:21 cziegeler Exp $
+ * @version CVS $Id: Logicsheet.java,v 1.13 2002/06/04 07:31:52 cziegeler Exp $
*/
public class Logicsheet extends AbstractLoggable
{
@@ -176,7 +177,7 @@
} catch (IOException e) {
throw new ProcessingException("Could not resolve " + this.systemId, e);
} catch (SourceException e) {
- throw new ProcessingException("Could not resolve " + this.systemId, e);
+ throw SourceUtil.handle("Could not resolve " + this.systemId, e);
} catch (XSLTProcessorException e) {
throw new ProcessingException("Could not transform " + this.systemId,
e);
} finally {
1.3 +27 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceUtil.java
Index: SourceUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceUtil.java 21 May 2002 08:29:35 -0000 1.2
+++ SourceUtil.java 4 Jun 2002 07:31:52 -0000 1.3
@@ -55,9 +55,11 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.xmlizer.XMLizer;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -67,7 +69,7 @@
* This class contains some utility methods for the source resolving.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: SourceUtil.java,v 1.2 2002/05/21 08:29:35 cziegeler Exp $
+ * @version $Id: SourceUtil.java,v 1.3 2002/06/04 07:31:52 cziegeler Exp $
*/
public final class SourceUtil
{
@@ -98,7 +100,7 @@
source.getSystemId(),
handler );
} catch (SourceException se) {
- throw new ProcessingException("Exception during streaming source.",
se);
+ throw SourceUtil.handle(se);
} catch (ComponentException ce) {
throw new ProcessingException("Exception during streaming source.",
ce);
} finally {
@@ -118,5 +120,28 @@
DOMBuilder builder = new DOMBuilder();
toSAX(source, builder, manager);
return builder.getDocument();
+ }
+
+ /**
+ * Make a ProcessingException from a SourceException
+ * If the exception is a SourceNotFoundException than a
+ * ResourceNotFoundException is thrown
+ */
+ static public ProcessingException handle(SourceException se) {
+ if (se instanceof SourceNotFoundException)
+ return new ResourceNotFoundException("Resource not found.", se);
+ return new ProcessingException("Exception during source resolving.", se);
+ }
+
+ /**
+ * Make a ProcessingException from a SourceException
+ * If the exception is a SourceNotFoundException than a
+ * ResourceNotFoundException is thrown
+ */
+ static public ProcessingException handle(String message,
+ SourceException se) {
+ if (se instanceof SourceNotFoundException)
+ return new ResourceNotFoundException(message, se);
+ return new ProcessingException(message, se);
}
}
1.5 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSource.java
Index: AvalonToCocoonSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AvalonToCocoonSource.java 4 Jun 2002 07:11:27 -0000 1.4
+++ AvalonToCocoonSource.java 4 Jun 2002 07:31:52 -0000 1.5
@@ -57,6 +57,7 @@
import org.apache.excalibur.source.impl.validity.FileTimeStampValidity;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ModifiableSource;
import org.xml.sax.ContentHandler;
@@ -69,7 +70,7 @@
* resolve() method of the environment!
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/06/04 07:11:27 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/06/04 07:31:52 $
*/
public final class AvalonToCocoonSource
@@ -127,7 +128,7 @@
try {
return this.source.getInputStream();
} catch (SourceException e) {
- throw new ProcessingException(e);
+ throw SourceUtil.handle(e);
}
}
@@ -146,7 +147,7 @@
newObject.setSystemId(this.getSystemId());
return newObject;
} catch (SourceException se) {
- throw new ProcessingException("SourceException", se);
+ throw SourceUtil.handle(se);
}
}
1.3 +4 -1
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/CocoonToAvalonSource.java
Index: CocoonToAvalonSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/CocoonToAvalonSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CocoonToAvalonSource.java 24 Apr 2002 13:48:20 -0000 1.2
+++ CocoonToAvalonSource.java 4 Jun 2002 07:31:52 -0000 1.3
@@ -57,6 +57,7 @@
import org.apache.excalibur.source.*;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ModifiableSource;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -66,7 +67,7 @@
* to avoid recoding existing source objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/04/24 13:48:20 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/06/04 07:31:52 $
*/
public final class CocoonToAvalonSource
@@ -88,6 +89,8 @@
throws IOException, SourceException {
try {
return this.source.getInputStream();
+ } catch (ResourceNotFoundException rnfe) {
+ throw new SourceNotFoundException("Source not found.", rnfe);
} catch (ProcessingException pe) {
throw new SourceException("ProcessingException", pe);
}
1.12 +5 -1
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SitemapSource.java 3 Jun 2002 11:45:52 -0000 1.11
+++ SitemapSource.java 4 Jun 2002 07:31:52 -0000 1.12
@@ -52,6 +52,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.AggregatedValidity;
import org.apache.avalon.excalibur.pool.Recyclable;
@@ -62,6 +63,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.PipelineCacheKey;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
@@ -92,7 +94,7 @@
* Description of a source which is defined by a pipeline.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SitemapSource.java,v 1.11 2002/06/03 11:45:52 cziegeler Exp $
+ * @version CVS $Id: SitemapSource.java,v 1.12 2002/06/04 07:31:52 cziegeler Exp $
*/
public final class SitemapSource
@@ -234,6 +236,8 @@
this.processingPipeline.process(this.environment);
return new ByteArrayInputStream(os.toByteArray());
+ } catch (ResourceNotFoundException e) {
+ throw new SourceNotFoundException("Exception during processing of " +
this.systemId, e);
} catch (Exception e) {
throw new SourceException("Exception during processing of " +
this.systemId, e);
} finally {
1.8 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptObjectFromURL.java
Index: XScriptObjectFromURL.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptObjectFromURL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XScriptObjectFromURL.java 2 May 2002 12:52:58 -0000 1.7
+++ XScriptObjectFromURL.java 4 Jun 2002 07:31:52 -0000 1.8
@@ -59,13 +59,14 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.avalon.framework.component.ComponentException;
/**
* An <code>XScriptObject</code> created from the contents of a URL.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: XScriptObjectFromURL.java,v 1.7 2002/05/02 12:52:58 cziegeler
Exp $
+ * @version CVS $Id: XScriptObjectFromURL.java,v 1.8 2002/06/04 07:31:52 cziegeler
Exp $
* @since August 30, 2001
*/
public class XScriptObjectFromURL extends XScriptObject
@@ -102,7 +103,7 @@
return source.getInputStream();
} catch (SourceException ex) {
- throw new ProcessingException(ex);
+ throw SourceUtil.handle(ex);
} catch (ComponentException ex) {
throw new ProcessingException(ex);
} finally {
1.20 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractEnvironment.java 26 Apr 2002 10:42:16 -0000 1.19
+++ AbstractEnvironment.java 4 Jun 2002 07:31:52 -0000 1.20
@@ -55,6 +55,7 @@
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceHandler;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.xmlizer.XMLizer;
import org.xml.sax.ContentHandler;
@@ -73,7 +74,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractEnvironment.java,v 1.19 2002/04/26 10:42:16 cziegeler
Exp $
+ * @version CVS $Id: AbstractEnvironment.java,v 1.20 2002/06/04 07:31:52 cziegeler
Exp $
*/
public abstract class AbstractEnvironment extends AbstractLoggable implements
Environment {
@@ -361,7 +362,7 @@
org.apache.excalibur.source.Source source = this.resolveURI( systemId );
return new
org.apache.cocoon.components.source.impl.AvalonToCocoonSource(source,
this.sourceResolver, this);
} catch (SourceException se) {
- throw new ProcessingException("Exception during resolving of " +
systemId, se);
+ throw SourceUtil.handle(se);
}
}
@@ -458,7 +459,7 @@
source.getSystemId(),
handler );
} catch (SourceException se) {
- throw new ProcessingException("Exception during streaming source.",
se);
+ throw SourceUtil.handle(se);
} catch (ComponentException ce) {
throw new ProcessingException("Exception during streaming source.",
ce);
}
1.13 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FileGenerator.java 28 May 2002 13:08:12 -0000 1.12
+++ FileGenerator.java 4 Jun 2002 07:31:52 -0000 1.13
@@ -53,6 +53,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -72,7 +73,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 $Id: FileGenerator.java,v 1.12 2002/05/28 13:08:12 cziegeler Exp $
+ * @version CVS $Id: FileGenerator.java,v 1.13 2002/06/04 07:31:52 cziegeler Exp $
*/
public class FileGenerator extends ComposerGenerator
implements CacheableProcessingComponent {
@@ -100,7 +101,7 @@
try {
this.inputSource = resolver.resolveURI(src);
} catch (SourceException se) {
- throw new ProcessingException("Error during resolving of '" + src +
"'.", se);
+ throw SourceUtil.handle("Error during resolving of '" + src + "'.", se);
}
}
1.16 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HTMLGenerator.java 28 May 2002 13:08:12 -0000 1.15
+++ HTMLGenerator.java 4 Jun 2002 07:31:52 -0000 1.16
@@ -58,6 +58,7 @@
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -86,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
- * @version CVS $Id: HTMLGenerator.java,v 1.15 2002/05/28 13:08:12 cziegeler Exp $
+ * @version CVS $Id: HTMLGenerator.java,v 1.16 2002/06/04 07:31:52 cziegeler Exp $
*/
public class HTMLGenerator extends ComposerGenerator
implements CacheableProcessingComponent, Disposable {
@@ -148,7 +149,7 @@
try {
this.inputSource = resolver.resolveURI(super.source);
} catch (SourceException se) {
- throw new ProcessingException("Unable to resolve " + super.source, se);
+ throw SourceUtil.handle("Unable to resolve " + super.source, se);
}
}
1.12 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ResourceReader.java 3 Jun 2002 12:50:18 -0000 1.11
+++ ResourceReader.java 4 Jun 2002 07:31:52 -0000 1.12
@@ -58,6 +58,7 @@
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
@@ -88,7 +89,7 @@
* </dl>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: ResourceReader.java,v 1.11 2002/06/03 12:50:18 cziegeler Exp $
+ * @version CVS $Id: ResourceReader.java,v 1.12 2002/06/04 07:31:52 cziegeler Exp $
*/
public class ResourceReader
extends AbstractReader
@@ -110,7 +111,7 @@
this.inputSource = resolver.resolveURI(src);
} catch (SourceException se) {
getLogger().error("Error during resolving of '" + src + "'.", se);
- throw new ProcessingException("Error during resolving of '" + src +
"'.", se);
+ throw SourceUtil.handle("Error during resolving of '" + src + "'.", se);
}
}
@@ -187,7 +188,7 @@
inputStream = null;
out.flush();
} catch (SourceException se) {
- throw new ProcessingException("Exception during resolving of read
source.", se);
+ throw SourceUtil.handle("Exception during resolving of read source.",
se);
}
}
1.7 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContentAggregator.java 29 May 2002 08:20:26 -0000 1.6
+++ ContentAggregator.java 4 Jun 2002 07:31:52 -0000 1.7
@@ -54,6 +54,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.xml.ContentHandlerWrapper;
@@ -78,7 +79,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ContentAggregator.java,v 1.6 2002/05/29 08:20:26 cziegeler Exp
$
+ * @version CVS $Id: ContentAggregator.java,v 1.7 2002/06/04 07:31:52 cziegeler Exp
$
*/
public class ContentAggregator
extends ContentHandlerWrapper
@@ -309,7 +310,7 @@
current.source = resolver.resolveURI(current.uri);
}
} catch (SourceException se) {
- throw new ProcessingException("Unable to resolve source.", se);
+ throw SourceUtil.handle("Unable to resolve source.", se);
}
}
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceWritingTransformer.java 28 May 2002 13:08:13 -0000 1.2
+++ SourceWritingTransformer.java 4 Jun 2002 07:31:52 -0000 1.3
@@ -780,7 +780,7 @@
} catch (ComponentException ce) {
throw new ProcessingException("Unable to lookup component.", ce);
} catch (SourceException se) {
- throw new ProcessingException("Error during resolving "+systemID, se);
+ throw SourceUtil.handle("Error during resolving "+systemID, se);
} finally {
this.resolver.release( source );
}
1.28 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TraxTransformer.java 28 May 2002 13:08:13 -0000 1.27
+++ TraxTransformer.java 4 Jun 2002 07:31:52 -0000 1.28
@@ -69,6 +69,7 @@
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.browser.Browser;
import org.apache.cocoon.components.deli.Deli;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -157,7 +158,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mark H. Butler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Id: TraxTransformer.java,v 1.27 2002/05/28 13:08:13 cziegeler Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.28 2002/06/04 07:31:52 cziegeler Exp $
*/
public class TraxTransformer extends AbstractTransformer
implements Transformer, Composable, Configurable, CacheableProcessingComponent,
Disposable {
@@ -304,7 +305,7 @@
try {
this.inputSource = resolver.resolveURI(src);
} catch (SourceException se) {
- throw new ProcessingException("Unable to resolve " + src, se);
+ throw SourceUtil.handle("Unable to resolve " + src, se);
}
_useParameters = par.getParameterAsBoolean("use-request-parameters",
this.useParameters);
_useBrowserCap = par.getParameterAsBoolean("use-browser-capabilities-db",
this.useBrowserCap);
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/Resource.java
Index: Resource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/Resource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Resource.java 21 May 2002 13:19:20 -0000 1.4
+++ Resource.java 4 Jun 2002 07:31:53 -0000 1.5
@@ -56,6 +56,7 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceParameters;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.SAXException;
@@ -64,7 +65,7 @@
* parameters.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Resource.java,v 1.4 2002/05/21 13:19:20 cziegeler Exp $
+ * @version CVS $Id: Resource.java,v 1.5 2002/06/04 07:31:53 cziegeler Exp $
*/
public final class Resource
implements Serializable {
@@ -110,7 +111,7 @@
this.resourceIdentifier = identifier;
}
} catch (SourceException se) {
- throw new ProcessingException("Unable to resolve " + identifier,
se);
+ throw SourceUtil.handle("Unable to resolve " + identifier, se);
} finally {
resolver.release( source );
}
1.5 +6 -6
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnectorImpl.java
Index: ResourceConnectorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnectorImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceConnectorImpl.java 21 May 2002 14:14:51 -0000 1.4
+++ ResourceConnectorImpl.java 4 Jun 2002 07:31:53 -0000 1.5
@@ -98,7 +98,7 @@
* The Component for loading and saving xml to external resource connectors.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ResourceConnectorImpl.java,v 1.4 2002/05/21 14:14:51 cziegeler
Exp $
+ * @version CVS $Id: ResourceConnectorImpl.java,v 1.5 2002/06/04 07:31:53 cziegeler
Exp $
*/
public final class ResourceConnectorImpl
extends AbstractLoggable
@@ -574,7 +574,7 @@
resourceType + " not supported.");
}
} catch (SourceException se) {
- throw new ProcessingException("SourceException: " + se, se);
+ throw org.apache.cocoon.components.source.SourceUtil.handle(se);
} catch (SAXException ioe) {
throw new ProcessingException("SAXException: " + ioe, ioe);
} catch (IOException ioe) {
@@ -613,7 +613,7 @@
resourceType + " not supported.");
}
} catch (SourceException se) {
- throw new ProcessingException("SourceException: " + se, se);
+ throw org.apache.cocoon.components.source.SourceUtil.handle(se);
} catch (SAXException ioe) {
throw new ProcessingException("SAXException: " + ioe, ioe);
} catch (IOException ioe) {
@@ -647,7 +647,7 @@
this.resolver.toSAX( input, filter );
} catch (SourceException se) {
- throw new ProcessingException("SourceException: " + se, se);
+ throw org.apache.cocoon.components.source.SourceUtil.handle(se);
} catch (SAXException sax) {
throw new ProcessingException("SAXException: " + sax, sax);
} catch (IOException ioe) {
@@ -739,8 +739,8 @@
default: throw new ProcessingException("ResourceConnector: type " +
resourceType + " not supported.");
}
- } catch (SourceException ioe) {
- throw new ProcessingException("SourceException: " + ioe, ioe);
+ } catch (SourceException se) {
+ throw org.apache.cocoon.components.source.SourceUtil.handle(se);
} catch (SAXException ioe) {
throw new ProcessingException("SAXException: " + ioe, ioe);
} catch (IOException ioe) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
