cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron SchematronFactory.java
Date Thu, 21 Nov 2002 15:06:52 GMT
sylvain     2002/11/21 07:06:52

  Modified:    src/java/org/apache/cocoon/components/language/markup/xsp
                        Tag: cocoon_2_0_3_branch EsqlConnection.java
                        EsqlHelper.java XSPRequestHelper.java XSPUtil.java
               src/java/org/apache/cocoon/components/language/programming/java
                        Tag: cocoon_2_0_3_branch Javac.java
               src/java/org/apache/cocoon/components/sax Tag:
                        cocoon_2_0_3_branch XMLByteStreamCompiler.java
               src/java/org/apache/cocoon/components/store Tag:
                        cocoon_2_0_3_branch FilesystemStore.java
               src/java/org/apache/cocoon/environment/http Tag:
                        cocoon_2_0_3_branch HttpContext.java
                        HttpRequest.java
               src/java/org/apache/cocoon/generation Tag:
                        cocoon_2_0_3_branch ImageDirectoryGenerator.java
                        PhpGenerator.java RequestGenerator.java
               src/java/org/apache/cocoon/serialization Tag:
                        cocoon_2_0_3_branch FOPSerializer.java
                        HTMLSerializer.java RTFSerializer.java
                        TextSerializer.java XMLSerializer.java
               src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
                        DOMBuilder.java
               src/scratchpad/src/org/apache/cocoon/sunshine Tag:
                        cocoon_2_0_3_branch SunShine.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise Tag:
                        cocoon_2_0_3_branch SunRise.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot Tag:
                        cocoon_2_0_3_branch SunSpot.java
               src/scratchpad/src/org/apache/cocoon/validation/schematron
                        Tag: cocoon_2_0_3_branch SchematronFactory.java
  Log:
  Changed all RuntimeExceptions that mask the original one to CascadingRuntimeExceptions.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.5   +4 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlConnection.java
  
  Index: EsqlConnection.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlConnection.java,v
  retrieving revision 1.6.2.4
  retrieving revision 1.6.2.5
  diff -u -r1.6.2.4 -r1.6.2.5
  --- EsqlConnection.java	17 Nov 2002 19:10:06 -0000	1.6.2.4
  +++ EsqlConnection.java	21 Nov 2002 15:06:48 -0000	1.6.2.5
  @@ -50,6 +50,8 @@
   */
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
  +
   import java.sql.Connection;
   import java.util.Properties;
   import java.sql.SQLException;
  @@ -134,7 +136,7 @@
         try {
           jdbcSource = connection.getMetaData().getURL();
         } catch (Exception e) {
  -        throw new RuntimeException("Error accessing connection metadata: "+e);
  +        throw new CascadingRuntimeException("Error accessing connection metadata", e);
         }
         if (jdbcSource.startsWith("jdbc:postgresql:")) {
           limitMethod = LIMIT_METHOD_POSTGRESQL;
  
  
  
  1.7.2.4   +25 -15    xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlHelper.java
  
  Index: EsqlHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlHelper.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- EsqlHelper.java	17 Nov 2002 19:10:06 -0000	1.7.2.3
  +++ EsqlHelper.java	21 Nov 2002 15:06:48 -0000	1.7.2.4
  @@ -50,6 +50,8 @@
   */
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
  +
   import java.io.BufferedInputStream;
   import java.io.BufferedReader;
   import java.io.Reader;
  @@ -80,7 +82,7 @@
           try {
               result = EsqlHelper.getBlob(set,set.findColumn(column));
           } catch (Exception e) {
  -            throw new RuntimeException("Error getting blob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting blob data for column " +
column, e);
           }
           return result;
       }
  @@ -109,7 +111,7 @@
                   return set.getString(column).getBytes();
               }
           } catch ( Exception e) {
  -            throw new RuntimeException("Error getting blob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting blob data for column " +
column, e);
           }
       }
   
  @@ -135,7 +137,7 @@
   		result = defaultString.getBytes();
   	    else result = null;
           } catch ( Exception e) {
  -            throw new RuntimeException("Error getting blob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting blob data for column " +
column, e);
           }
   	return result;
       }
  @@ -148,7 +150,7 @@
           try {
               result = EsqlHelper.getStringOrClob(set,set.findColumn(column), defaultString);
           } catch (Exception e) {
  -            throw new RuntimeException("Error getting clob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting text data for column " +
column, e);
           }
           return result;
       }
  @@ -183,7 +185,7 @@
   		    result = defaultString;
               }
           } catch ( Exception e) {
  -            throw new RuntimeException("Error getting clob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting text data for column " +
column, e);
           }
   	return result;
       }
  @@ -210,7 +212,7 @@
   		result = defaultString;
   	    else result = null;
           } catch ( Exception e) {
  -            throw new RuntimeException("Error getting clob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting clob data for column " +
column, e);
           }
   	return result;
       }
  @@ -224,7 +226,7 @@
             try {
                 result = EsqlHelper.getAscii(set,set.findColumn(column),defaultString);
             } catch (Exception e) {
  -              throw new RuntimeException("Error getting clob data: " + e.getMessage());
  +              throw new CascadingRuntimeException("Error getting ascii data for column
" + column, e);
             }
             return result;
         }
  @@ -256,10 +258,14 @@
   		    result = defaultString;
               }
           } catch (Exception e) {
  -            throw new RuntimeException("Error getting clob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting ascii data for column "
+ column, e);
           } finally {
  -            if (asciiStream != null) try {asciiStream.close();} catch (Exception ase) {
  -                throw new RuntimeException("Error closing clob stream: " + ase.getMessage());
  +            if (asciiStream != null) {
  +                try {
  +                    asciiStream.close();
  +                } catch (Exception ase) {
  +                    throw new CascadingRuntimeException("Error closing clob stream", ase);
  +                }
               }
           }
           
  @@ -285,10 +291,14 @@
   		result = defaultString;
   	    else result = null;
           } catch (Exception e) {
  -            throw new RuntimeException("Error getting clob data: " + e.getMessage());
  +            throw new CascadingRuntimeException("Error getting ascii data for colum " +
column, e);
           } finally {
  -            if (asciiStream != null) try {asciiStream.close();} catch (Exception ase) {
  -                throw new RuntimeException("Error closing clob stream: " + ase.getMessage());
  +            if (asciiStream != null) {
  +                try {
  +                    asciiStream.close();
  +                } catch (Exception ase) {
  +                    throw new CascadingRuntimeException("Error closing clob stream", ase);
  +                }
               }
           }
           
  @@ -300,7 +310,7 @@
               try {
                   return new String(bytes,encoding);
               } catch (java.io.UnsupportedEncodingException uee) {
  -                throw new RuntimeException("Unsupported Encoding Exception: " + uee.getMessage());
  +                throw new CascadingRuntimeException("Unsupported Encoding Exception", uee);
               }
           }
           else {
  
  
  
  1.11.2.2  +5 -7      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
  
  Index: XSPRequestHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- XSPRequestHelper.java	11 Aug 2002 20:07:45 -0000	1.11.2.1
  +++ XSPRequestHelper.java	21 Nov 2002 15:06:48 -0000	1.11.2.2
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Request;
  @@ -167,8 +168,7 @@
               try {
                   value = new String(value.getBytes(container_encoding), form_encoding);
               } catch(java.io.UnsupportedEncodingException uee) {
  -                throw new RuntimeException("Unsupported Encoding Exception: " +
  -                    uee.getMessage());
  +                throw new CascadingRuntimeException("Unsupported Encoding Exception", uee);
               }
           }
   
  @@ -283,8 +283,7 @@
                           values[i] = new String(values[i].getBytes(container_encoding),
                               form_encoding);
                       } catch(java.io.UnsupportedEncodingException uee) {
  -                        throw new RuntimeException("Unsupported Encoding Exception: " +
  -                            uee.getMessage());
  +                        throw new CascadingRuntimeException("Unsupported Encoding Exception",
uee);
                       }
                   }
                   XSPObjectHelper.elementData(URI, PREFIX, contentHandler,
  @@ -318,8 +317,7 @@
                           values[i] = new String(values[i].getBytes(container_encoding),
                               form_encoding);
                       } catch(java.io.UnsupportedEncodingException uee) {
  -                        throw new RuntimeException("Unsupported Encoding Exception: " +
  -                            uee.getMessage());
  +                        throw new CascadingRuntimeException("Unsupported Encoding Exception",
uee);
                       }
                   }
               }
  
  
  
  1.6.2.3   +11 -7     xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
  
  Index: XSPUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- XSPUtil.java	15 Jul 2002 07:06:54 -0000	1.6.2.2
  +++ XSPUtil.java	21 Nov 2002 15:06:48 -0000	1.6.2.3
  @@ -64,10 +64,10 @@
   import org.xml.sax.SAXException;
   
   import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Component;
   import org.apache.cocoon.environment.Source;
  -import java.lang.Long;
   
   import java.io.*;
   import java.net.URLDecoder;
  @@ -303,10 +303,14 @@
                   stream.close();
               }
           } catch (Exception e) {
  -            throw new RuntimeException(e.getMessage());
  +            throw new CascadingRuntimeException("Failed to get " + uri + " as string",
e);
           } finally {
               if ( stream != null )
  -                try {stream.close();} catch (Exception ase) {  throw new RuntimeException(ase.getMessage());
}
  +                try {
  +                    stream.close();
  +                } catch (Exception ase) {
  +                    throw new CascadingRuntimeException("Failed to close stream", ase);
  +                }
               if ( resource != null )
                   resource.recycle();
           }
  @@ -323,7 +327,7 @@
               source = resolver.resolve(base+uri);
               source.toSAX(new org.apache.cocoon.xml.IncludeXMLConsumer(contentHandler));
             } catch (Exception e) {
  -              throw new RuntimeException("Error including source "+base+" "+uri+":"+e.getMessage());
  +              throw new CascadingRuntimeException("Error including source "+base+" "+uri,
e);
             } finally {
                 if (source != null)
                    source.recycle();
  @@ -343,7 +347,7 @@
               XSPUtil.includeInputSource(new InputSource(new FileReader(XSPUtil.relativeFilename(name,objectModel))),

                                          manager, contentHandler);
           } catch (IOException e) {
  -            throw new RuntimeException("Could not include file "+name+" : " + e.getMessage());
  +            throw new CascadingRuntimeException("Could not include file "+name, e);
           }
       }   
   
  @@ -356,7 +360,7 @@
               newParser = (Parser) manager.lookup(Parser.ROLE);
               XSPUtil.include(source, contentHandler, newParser);
           } catch (Exception e) {
  -            throw new RuntimeException("Could not include page " + e.getMessage());
  +            throw new CascadingRuntimeException("Could not include page", e);
           } finally {
               if (newParser != null) manager.release((Component) newParser);
           }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.2   +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/Javac.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- Javac.java	25 Jul 2002 14:07:51 -0000	1.6.2.1
  +++ Javac.java	21 Nov 2002 15:06:48 -0000	1.6.2.2
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.components.language.programming.java;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.components.language.programming.CompilerError;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.log.Hierarchy;
  @@ -88,7 +89,7 @@
               modern = false;
           } catch (Exception ex) {
               Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").error("No compiler found
in your classpath. Make sure you added 'tools.jar'", ex);
  -            throw new RuntimeException("No compiler found in your classpath. Make sure
you added 'tools.jar'");
  +            throw new CascadingRuntimeException("No compiler found in your classpath. Make
sure you added 'tools.jar'", ex);
           }
       }
     }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.2   +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
  
  Index: XMLByteStreamCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- XMLByteStreamCompiler.java	26 Aug 2002 11:13:36 -0000	1.5.2.1
  +++ XMLByteStreamCompiler.java	21 Nov 2002 15:06:48 -0000	1.5.2.2
  @@ -51,6 +51,7 @@
   package org.apache.cocoon.components.sax;
   
   import org.apache.avalon.excalibur.pool.Recyclable;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.Component;
   import org.xml.sax.Attributes;
   import org.xml.sax.Locator;
  @@ -200,7 +201,7 @@
               this.write(locator.getLineNumber());
               this.write(locator.getColumnNumber());
           } catch (Exception e) {
  -             throw new RuntimeException(e.toString());
  +             throw new CascadingRuntimeException("Cannot write locator info", e);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.4  +3 -2      xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java
  
  Index: FilesystemStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java,v
  retrieving revision 1.14.2.3
  retrieving revision 1.14.2.4
  diff -u -r1.14.2.3 -r1.14.2.4
  --- FilesystemStore.java	8 Aug 2002 14:02:43 -0000	1.14.2.3
  +++ FilesystemStore.java	21 Nov 2002 15:06:48 -0000	1.14.2.4
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.components.store;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -377,7 +378,7 @@
           try {
               return java.net.URLDecoder.decode( filename );
           } catch (Exception local) {
  -            throw new RuntimeException("Exception in decode: " + local);
  +            throw new CascadingRuntimeException("Exception in decode", local);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +3 -2      xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpContext.java
  
  Index: HttpContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpContext.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- HttpContext.java	22 Feb 2002 07:03:50 -0000	1.7
  +++ HttpContext.java	21 Nov 2002 15:06:49 -0000	1.7.2.1
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.environment.http;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.environment.Context;
   
   import javax.servlet.ServletContext;
  @@ -110,7 +111,7 @@
                   try {
                   value = this.servletContext.getResource("/WEB-INF").toString();
                   } catch (MalformedURLException mue) {
  -                    throw new RuntimeException("Cannot determine the base URL");
  +                    throw new CascadingRuntimeException("Cannot determine the base URL",
mue);
                   }
                   value = value.substring(0,value.length()-"WEB-INF".length());
               }
  
  
  
  1.6.2.4   +3 -3      xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v
  retrieving revision 1.6.2.3
  retrieving revision 1.6.2.4
  diff -u -r1.6.2.3 -r1.6.2.4
  --- HttpRequest.java	29 Oct 2002 04:48:59 -0000	1.6.2.3
  +++ HttpRequest.java	21 Nov 2002 15:06:49 -0000	1.6.2.4
  @@ -53,6 +53,7 @@
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.components.request.RequestFactory;
   
   import javax.servlet.RequestDispatcher;
  @@ -303,8 +304,7 @@
               byte[] bytes = str.getBytes(this.container_encoding);
               return new String(bytes, form_encoding);
           } catch (java.io.UnsupportedEncodingException uee) {
  -            throw new RuntimeException("Unsupported Encoding Exception: " +
  -            uee.getMessage());
  +            throw new CascadingRuntimeException("Unsupported Encoding Exception", uee);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +10 -8     xml-cocoon2/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
  
  Index: ImageDirectoryGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- ImageDirectoryGenerator.java	22 Feb 2002 07:03:51 -0000	1.4
  +++ ImageDirectoryGenerator.java	21 Nov 2002 15:06:49 -0000	1.4.2.1
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.generation;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.log.Hierarchy;
   import org.xml.sax.SAXException;
   
  @@ -98,7 +99,7 @@
               else return getJpegSize(file);
           } catch(Exception e) {
               Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("File is not a
valid GIF or Jpeg", e);
  -            throw new RuntimeException("File is not a valid GIF or Jpeg");
  +            throw new CascadingRuntimeException("File is not a valid GIF or Jpeg", e);
           }
   
       }
  @@ -111,10 +112,10 @@
               // check for "magic" header
               byte[] buf = new byte[2];
               int count = in.read(buf, 0, 2);
  -            if(count < 2) throw new RuntimeException("Not a valid Jpeg file!");
  +            if(count < 2) throw new RuntimeException("File " + file  + " is not a valid
Jpeg file!");
               if((buf[0]) != (byte)0xFF
               || (buf[1]) != (byte)0xD8 )
  -            throw new RuntimeException("Not a valid Jpeg file!");
  +            throw new RuntimeException("File " + file + " is not a valid Jpeg file!");
   
               int width = 0;
               int height = 0;
  @@ -149,8 +150,9 @@
                       }
                   }
               } catch(Exception e) {
  -                Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("Not a valid
Jpeg file!", e);
  -                throw new RuntimeException("Not a valid Jpeg file!");
  +                String msg = "File " + file + " is not a valid Jpeg file!";
  +                Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug(msg, e);
  +                throw new CascadingRuntimeException(msg, e);
               }
   
               int[] dim = { width, height };
  @@ -168,11 +170,11 @@
               in = new BufferedInputStream(new FileInputStream(file));
               byte[] buf = new byte[10];
               int count = in.read(buf, 0, 10);
  -            if(count < 10) throw new RuntimeException("Not a valid GIF file!");
  +            if(count < 10) throw new RuntimeException("File " + file + " is not a valid
GIF file!");
               if((buf[0]) != (byte)'G'
               || (buf[1]) != (byte)'I'
               || (buf[2]) != (byte)'F' )
  -            throw new RuntimeException("Not a valid GIF file!");
  +            throw new RuntimeException("File " + file + " is not a valid GIF file!");
   
               int w1 = ((int)buf[6] & 0xff) | (buf[6] & 0x80);
               int w2 = ((int)buf[7] & 0xff) | (buf[7] & 0x80);
  
  
  
  1.6.2.1   +4 -2      xml-cocoon2/src/java/org/apache/cocoon/generation/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/PhpGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- PhpGenerator.java	22 Feb 2002 07:03:51 -0000	1.6
  +++ PhpGenerator.java	21 Nov 2002 15:06:49 -0000	1.6.2.1
  @@ -51,6 +51,8 @@
   package org.apache.cocoon.generation;
   
   import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.avalon.framework.CascadingException;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.http.HttpEnvironment;
  @@ -125,7 +127,7 @@
                   output.write(data.getBytes());
               } catch (IOException e) {
                   PhpGenerator.this.getLogger().debug("PhpGenerator.write()", e);
  -                throw new RuntimeException(e.getMessage());
  +                throw new CascadingRuntimeException("PhpGenerator.write()", e);
               }
           }
   
  
  
  
  1.6.2.1   +3 -3      xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java
  
  Index: RequestGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- RequestGenerator.java	22 Feb 2002 07:03:51 -0000	1.6
  +++ RequestGenerator.java	21 Nov 2002 15:06:49 -0000	1.6.2.1
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.generation;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.parameters.ParameterException;
  @@ -162,8 +163,7 @@
                           this.data(new String(values[x].getBytes(container_encoding),
                               form_encoding));
                       } catch(java.io.UnsupportedEncodingException uee) {
  -                        throw new RuntimeException("Unsupported Encoding Exception: " +
  -                            uee.getMessage());
  +                        throw new CascadingRuntimeException("Unsupported Encoding Exception",
uee);
                       }
                   } else {
                       this.data(values[x]);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.5   +3 -2      xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/FOPSerializer.java
  
  Index: FOPSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/FOPSerializer.java,v
  retrieving revision 1.7.2.4
  retrieving revision 1.7.2.5
  diff -u -r1.7.2.4 -r1.7.2.5
  --- FOPSerializer.java	3 Oct 2002 04:42:15 -0000	1.7.2.4
  +++ FOPSerializer.java	21 Nov 2002 15:06:49 -0000	1.7.2.5
  @@ -54,6 +54,7 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.LogKitLogger;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -257,7 +258,7 @@
                   if (getLogger().isWarnEnabled()) {
                       getLogger().warn("Cannot load  class " + this.rendererName, e);
                   }
  -                throw new RuntimeException("Cannot load class " + this.rendererName + "("
+ e + ")");
  +                throw new CascadingRuntimeException("Cannot load class " + this.rendererName,
e);
               }
           }
           this.driver.setRenderer(this.renderer);
  
  
  
  1.5.2.1   +4 -2      xml-cocoon2/src/java/org/apache/cocoon/serialization/HTMLSerializer.java
  
  Index: HTMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/HTMLSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- HTMLSerializer.java	22 Feb 2002 07:03:55 -0000	1.5
  +++ HTMLSerializer.java	21 Nov 2002 15:06:49 -0000	1.5.2.1
  @@ -50,6 +50,8 @@
   */
   package org.apache.cocoon.serialization;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  @@ -78,7 +80,7 @@
               this.setLexicalHandler(handler);
           } catch (Exception e) {
               getLogger().error("HTMLSerializer.setOutputStream()", e);
  -            throw new RuntimeException(e.toString());
  +            throw new CascadingRuntimeException("HTMLSerializer.setOutputStream()", e);
           }
       }
   
  
  
  
  1.5.2.2   +4 -2      xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/RTFSerializer.java
  
  Index: RTFSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/RTFSerializer.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- RTFSerializer.java	3 May 2002 12:27:25 -0000	1.5.2.1
  +++ RTFSerializer.java	21 Nov 2002 15:06:49 -0000	1.5.2.2
  @@ -52,6 +52,8 @@
   
   import java.net.URL;
   import java.net.MalformedURLException;
  +
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -121,7 +123,7 @@
   
           } catch (Exception e) {
               getLogger().error("RTFSerializer.setOutputStream()", e);
  -            throw new RuntimeException(e.toString());
  +            throw new CascadingRuntimeException("RTFSerializer.setOutputStream()", e);
           }
       }
   
  
  
  
  1.5.2.1   +4 -2      xml-cocoon2/src/java/org/apache/cocoon/serialization/TextSerializer.java
  
  Index: TextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/TextSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TextSerializer.java	22 Feb 2002 07:03:55 -0000	1.5
  +++ TextSerializer.java	21 Nov 2002 15:06:49 -0000	1.5.2.1
  @@ -50,6 +50,8 @@
   */
   package org.apache.cocoon.serialization;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  @@ -78,7 +80,7 @@
               this.setLexicalHandler(handler);
          } catch (Exception e) {
               getLogger().error("TextSerializer.setOutputStream()", e);
  -            throw new RuntimeException(e.toString());
  +            throw new CascadingRuntimeException("TextSerializer.setOutputStream()", e);
           }
       }
   
  
  
  
  1.5.2.1   +4 -2      xml-cocoon2/src/java/org/apache/cocoon/serialization/XMLSerializer.java
  
  Index: XMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/XMLSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- XMLSerializer.java	22 Feb 2002 07:03:55 -0000	1.5
  +++ XMLSerializer.java	21 Nov 2002 15:06:49 -0000	1.5.2.1
  @@ -50,6 +50,8 @@
   */
   package org.apache.cocoon.serialization;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
  +
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  @@ -78,7 +80,7 @@
               this.setLexicalHandler(handler);
           } catch (Exception e) {
               getLogger().error("XMLSerializer.setOutputStream()", e);
  -            throw new RuntimeException(e.toString());
  +            throw new CascadingRuntimeException("XMLSerializer.setOutputStream()", e);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +4 -3      xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java
  
  Index: DOMBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- DOMBuilder.java	10 Mar 2002 02:15:02 -0000	1.7
  +++ DOMBuilder.java	21 Nov 2002 15:06:49 -0000	1.7.2.1
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.xml.dom;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.xml.sax.SAXException;
   import org.w3c.dom.Document;
  @@ -136,7 +137,7 @@
               }
               handler.setResult(this.result);
           } catch (javax.xml.transform.TransformerException local) {
  -            throw new RuntimeException("Fatal-Error: Unable to get transformer handler");
  +            throw new CascadingRuntimeException("Fatal-Error: Unable to get transformer
handler", local);
           }
       }
   
  @@ -167,7 +168,7 @@
               }
               handler.setResult(this.result);
           } catch (javax.xml.transform.TransformerException local) {
  -            throw new RuntimeException("Fatal-Error: Unable to get transformer handler");
  +            throw new CascadingRuntimeException("Fatal-Error: Unable to get transformer
handler", local);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.2   +3 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/Attic/SunShine.java
  
  Index: SunShine.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/Attic/SunShine.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- SunShine.java	5 Jul 2002 15:20:48 -0000	1.5.2.1
  +++ SunShine.java	21 Nov 2002 15:06:50 -0000	1.5.2.2
  @@ -54,6 +54,7 @@
   import java.util.*;
   import java.util.jar.*;
   
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -160,7 +161,7 @@
               SunShine.addSessionContextProvider(provider, SunShineConstants.REQUEST_CONTEXT);
               SunShine.addSessionContextProvider(provider, SunShineConstants.RESPONSE_CONTEXT);
           } catch (ProcessingException local) {
  -            throw new RuntimeException("Unable to register provider for standard contexts.");
  +            throw new CascadingRuntimeException("Unable to register provider for standard
contexts.", local);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.6   +3 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/SunRise.java
  
  Index: SunRise.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/Attic/SunRise.java,v
  retrieving revision 1.5.2.5
  retrieving revision 1.5.2.6
  diff -u -r1.5.2.5 -r1.5.2.6
  --- SunRise.java	21 Aug 2002 14:55:27 -0000	1.5.2.5
  +++ SunRise.java	21 Nov 2002 15:06:50 -0000	1.5.2.6
  @@ -55,6 +55,7 @@
   
   import org.apache.excalibur.source.SourceParameters;
   import org.apache.excalibur.source.SourceUtil;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -155,7 +156,7 @@
           try {
               SunShine.addSessionContextProvider(contextProvider, Constants.SESSION_CONTEXT_NAME);
           } catch (ProcessingException local) {
  -            throw new RuntimeException("Unable to register provider for sunRise context.");
  +            throw new CascadingRuntimeException("Unable to register provider for sunRise
context.", local);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.3   +3 -2      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/Attic/SunSpot.java
  
  Index: SunSpot.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/Attic/SunSpot.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- SunSpot.java	1 Jul 2002 08:40:06 -0000	1.5.2.2
  +++ SunSpot.java	21 Nov 2002 15:06:51 -0000	1.5.2.3
  @@ -59,6 +59,7 @@
   import java.util.Map;
   
   import org.apache.excalibur.source.SourceParameters;
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -181,7 +182,7 @@
           try {
               SunShine.addSessionContextProvider(provider, Constants.SESSION_CONTEXT_NAME);
           } catch (ProcessingException local) {
  -            throw new RuntimeException("Unable to register provider for sunSpot context.");
  +            throw new CascadingRuntimeException("Unable to register provider for sunSpot
context.", local);
           }
       }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +5 -4      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java
  
  Index: SchematronFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- SchematronFactory.java	5 Jun 2002 17:19:30 -0000	1.1.2.2
  +++ SchematronFactory.java	21 Nov 2002 15:06:52 -0000	1.1.2.3
  @@ -88,6 +88,7 @@
   import org.apache.commons.jxpath.JXPathContext;
   
   // Cocoon classes
  +import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.cocoon.validation.SchemaFactory;
   import org.apache.cocoon.validation.Schema;
   
  @@ -153,7 +154,7 @@
   
       } catch (Exception e) {
           logger.error("!!! Failed loading Schematron schema", e);
  -        throw new RuntimeException(" !!! Failed loading Schematron schema: \n" + e);
  +        throw new CascadingRuntimeException(" !!! Failed loading Schematron schema", e);
       }
      return schema;
     } // build
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message