cziegeler 01/06/19 00:37:55
Modified: src/org/apache/cocoon/generation Tag: cocoon_20_branch
FileGenerator.java JspGenerator.java
src/org/apache/cocoon/transformation Tag: cocoon_20_branch
I18nTransformer.java LDAPTransformer.java
XIncludeTransformer.java
Log:
Updated exception handling: catched exceptions are included in the rethrown one
Revision Changes Path
No revision
No revision
1.9.2.4 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- FileGenerator.java 2001/06/12 20:03:45 1.9.2.3
+++ FileGenerator.java 2001/06/19 07:37:52 1.9.2.4
@@ -39,7 +39,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.9.2.3 $ $Date: 2001/06/12 20:03:45 $
+ * @version CVS $Revision: 1.9.2.4 $ $Date: 2001/06/19 07:37:52 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable, Recyclable {
@@ -117,7 +117,7 @@
} catch (FileNotFoundException e) {
getLogger().warn("FileGenerator could not find resource " +
this.inputSource.getSystemId(), e);
throw new ResourceNotFoundException("FileGenerator could not find
resource "
- + this.inputSource.getSystemId());
+ + this.inputSource.getSystemId(), e);
} catch (IOException e) {
getLogger().error("FileGenerator.generate()", e);
throw new ResourceNotFoundException("FileGenerator could not read
resource", e);
1.6.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- JspGenerator.java 2001/05/31 17:38:21 1.6
+++ JspGenerator.java 2001/06/19 07:37:52 1.6.2.1
@@ -48,7 +48,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:38:21 $
+ * @version CVS $Revision: 1.6.2.1 $ $Date: 2001/06/19 07:37:52 $
*/
public class JspGenerator extends ServletGenerator implements Recyclable {
@@ -97,7 +97,7 @@
throw e;
} catch (Exception e) {
getLogger().debug("JspGenerator.generate()", e);
- throw new IOException(e.toString());
+ throw new SAXException(e);
} finally {
if (parser != null) this.manager.release(parser);
}
No revision
No revision
1.8.2.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- I18nTransformer.java 2001/06/15 18:00:41 1.8.2.1
+++ I18nTransformer.java 2001/06/19 07:37:53 1.8.2.2
@@ -880,7 +880,7 @@
throw e;
} catch(ComponentException e) {
getLogger().error("Error in initialiseDictionary", e);
- throw new SAXException("ComponentException in initialiseDictionary");
+ throw new SAXException(e);
} finally {
if(parser != null) this.manager.release((Component) parser);
}
@@ -915,4 +915,4 @@
}
}
-}
\ No newline at end of file
+}
1.1.2.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java
Index: LDAPTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LDAPTransformer.java 2001/06/08 19:44:04 1.1.2.1
+++ LDAPTransformer.java 2001/06/19 07:37:54 1.1.2.2
@@ -279,10 +279,10 @@
query.execute();
} catch (NamingException e) {
getLogger().error(e.toString());
- throw new SAXException (e.toString());
+ throw new SAXException (e);
} catch (Exception e) {
getLogger().error(e.toString());
- throw new SAXException (e.toString());
+ throw new SAXException (e);
}
this.contentHandler.endPrefixMapping("");
1.6.2.1 +2 -2
xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- XIncludeTransformer.java 2001/05/31 17:39:02 1.6
+++ XIncludeTransformer.java 2001/06/19 07:37:54 1.6.2.1
@@ -54,7 +54,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:39:02 $ $Author: bloritsch $
+ * @version CVS $Revision: 1.6.2.1 $ $Date: 2001/06/19 07:37:54 $ $Author:
cziegeler $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable {
@@ -277,7 +277,7 @@
throw e;
} catch(ComponentException e) {
getLogger().error("Error in processXIncludeElement", e);
- throw new SAXException("ComponentException in
processXIncludeElement");
+ throw new SAXException(e);
} finally {
if(parser != null) this.manager.release(parser);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
