cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java ErrorDispatcher.java JavacErrorDetail.java

2004-05-25 Thread luehe 
luehe   2004/05/25 14:27:55

  Modified:jasper2/src/share/org/apache/jasper/compiler
DefaultErrorHandler.java ErrorDispatcher.java
JavacErrorDetail.java
  Log:
  Include javac errors whose line numbers cannot be mapped to JSP page in error 
message that is returned to client.
  
  For instance, a missing closing brace in a scriptlet causes havoc with the 
try-catch-finally block that that JSP compiler puts around all generated code, and the 
resulting javac error line numbers fall outside the scope of the begin and end java 
line numbers of the scriptlet (and therefore cannot be mapped back to the JSP line 
number of the scriptlet).
  
  (This used to return the misleading error message about failure to find javac 
compiler.)
  
  Revision  ChangesPath
  1.12  +12 -7 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
  
  Index: DefaultErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultErrorHandler.java  21 May 2004 17:52:59 -  1.11
  +++ DefaultErrorHandler.java  25 May 2004 21:27:55 -  1.12
  @@ -66,18 +66,23 @@
   StringBuffer buf = new StringBuffer();
   
   for (int i=0; i  details.length; i++) {
  -args = new Object[] {
  +if (details[i].getJspBeginLineNumber() = 0) {
  +args = new Object[] {
   new Integer(details[i].getJspBeginLineNumber()), 
   details[i].getJspFileName() };
  -buf.append(Localizer.getMessage(jsp.error.single.line.number,
  -args));
  -buf.append(Localizer.getMessage(jsp.error.corresponding.servlet));
  +buf.append(Localizer.getMessage(jsp.error.single.line.number,
  +args));
  +buf.append(\n); 
  +}
  +
  +buf.append(
  +Localizer.getMessage(jsp.error.corresponding.servlet));
   buf.append(details[i].getErrorMessage());
  -buf.append('\n');
  +buf.append(\n\n);
   }
   
  - throw new JasperException(Localizer.getMessage(jsp.error.unable.compile)
  -   + buf);
  + throw new JasperException(
  +Localizer.getMessage(jsp.error.unable.compile) + \n\n + buf);
   }
   
   /**
  
  
  
  1.20  +44 -25
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
  
  Index: ErrorDispatcher.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ErrorDispatcher.java  21 May 2004 17:52:59 -  1.19
  +++ ErrorDispatcher.java  25 May 2004 21:27:55 -  1.20
  @@ -431,9 +431,9 @@
throws IOException, JasperException {
   
Vector errVec = new Vector();
  - StringBuffer partialErrMsg = new StringBuffer();
  + StringBuffer errMsgBuf = null;
int lineNum = -1;
  - Node errNode = null;
  +JavacErrorDetail javacError = null;
   
   BufferedReader reader = new BufferedReader(new StringReader(errMsg));
   
  @@ -453,16 +453,11 @@
   int beginColon = line.indexOf(':', 2); 
   int endColon = line.indexOf(':', beginColon + 1);
   if ((beginColon = 0)  (endColon = 0)) {
  - if (errNode != null) {
  - // add previous error to error vector
  - errVec.add(new JavacErrorDetail(
  - fname,
  - lineNum,
  - errNode.getStart().getFile(),
  - errNode.getStart().getLineNumber(),
  - partialErrMsg.toString()));
  - partialErrMsg = new StringBuffer();
  +if (javacError != null) {
  +// add previous error to error vector
  +errVec.add(javacError);
}
  +
String lineNumStr = line.substring(beginColon + 1, endColon);
   try {
   lineNum = Integer.parseInt(lineNumStr);
  @@ -470,29 +465,53 @@
   // XXX
   }
   
  - // Map servlet line number to corresponding node in JSP page
  +errMsgBuf = new StringBuffer();
  +
  +// Attempt to map javac error line number to line in JSP page
ErrorVisitor errVisitor = new ErrorVisitor(lineNum);

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java

2003-10-22 Thread kinman 
kinman  2003/10/22 16:52:55

  Modified:jasper2/src/share/org/apache/jasper/compiler
DefaultErrorHandler.java
  Log:
  - Make sure that the No Java compiler error message is produced only when
there is really no javac.  This also fixes 24019
  
  Revision  ChangesPath
  1.8   +4 -5  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
  
  Index: DefaultErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultErrorHandler.java  8 Jul 2003 22:53:38 -   1.7
  +++ DefaultErrorHandler.java  22 Oct 2003 23:52:55 -  1.8
  @@ -106,8 +106,7 @@
   StringBuffer buf = new StringBuffer();

   if ((details.length == 1) 
  - (details[0].getJspBeginLineNumber() == -1)
  - (details[0].getJspFileName() == null)) {
  + (details[0].getJavaLineNumber() == -1)) {
   // Special case: No Java compiler found
   buf.append(Localizer.getMessage(jsp.error.nojavac));
   buf.append('\n');
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java ErrorDispatcher.java ErrorHandler.java

2002-11-05 Thread luehe 
luehe   2002/11/05 12:30:25

  Modified:jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch DefaultErrorHandler.java
ErrorDispatcher.java ErrorHandler.java
  Log:
  Fixed Bugzilla 14195: NPE from dispatch() when no errCode
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.1.1.2.1 +15 -5 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
  
  Index: DefaultErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- DefaultErrorHandler.java  28 Mar 2002 18:46:18 -  1.1.1.1
  +++ DefaultErrorHandler.java  5 Nov 2002 20:30:25 -   1.1.1.1.2.1
   -90,9 +90,19 
* param exception Parse exception
*/
   public void jspError(String fname, int line, int column, String errMsg,
  -  Exception exception) throws JasperException {
  +  Exception ex) throws JasperException {
throw new JasperException(fname + ( + line + , + column + )
  -   +   + errMsg);
  +   +   + errMsg, ex);
  +}
  +
  +/*
  + * Processes the given JSP parse error.
  + *
  + * param errMsg Parse error message
  + * param exception Parse exception
  + */
  +public void jspError(String errMsg, Exception ex) throws JasperException {
  + throw new JasperException(errMsg, ex);
   }
   
   /*
  
  
  
  1.2.2.1   +20 -6 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
  
  Index: ErrorDispatcher.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ErrorDispatcher.java  15 May 2002 20:42:03 -  1.2
  +++ ErrorDispatcher.java  5 Nov 2002 20:30:25 -   1.2.2.1
   -391,30 +391,44 
   private void dispatch(Mark where, String errCode, Object[] args,
  Exception e) throws JasperException {
String file = null;
  + String errMsg = null;
int line = -1;
int column = -1;
  + boolean hasLocation = false;
   
// Localize
  - String errMsg = getString(errCode, args);
  + if (errCode != null) {
  + errMsg = getString(errCode, args);
  + } else if (e != null) {
  + // give a hint about what's wrong
  + errMsg = e.getMessage();
  + }
   
// Get error location
if (where != null) {
file = where.getFile();
line = where.getLineNumber();
column = where.getColumnNumber();
  + hasLocation = true;
} else if (e instanceof SAXParseException) {
file = ((SAXParseException) e).getSystemId();
line = ((SAXParseException) e).getLineNumber();
column = ((SAXParseException) e).getColumnNumber();
  + hasLocation = true;
}
   
// Get nested exception
Exception nestedEx = e;
  - if (e instanceof SAXException) {
  + if ((e instanceof SAXException)
  +  (((SAXException) e).getException() != null)) {
nestedEx = ((SAXException) e).getException();
}
   
  - errHandler.jspError(file, line, column, errMsg, nestedEx);
  + if (hasLocation) {
  + errHandler.jspError(file, line, column, errMsg, nestedEx);
  + } else {
  + errHandler.jspError(errMsg, nestedEx);
  + }
   }
   
   /*
  
  
  
  1.1.1.1.2.1 +12 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- ErrorHandler.java 28 Mar 2002 18:46:18 -  1.1.1.1
  +++ ErrorHandler.java 5 Nov 2002 20:30:25 -   1.1.1.1.2.1
   -88,6 +88,15 
 Exception exception) throws JasperException;
   
   /**
  + * Processes the given JSP parse error.
  + *
  + * param errMsg Parse error message
  + * param exception Parse exception
  + */
  +public void jspError(String msg, Exception exception)
  + throws JasperException;
  +
  +/**
* Processes the given javac compilation errors.
*
* param details Array of JavacErrorDetail

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java

2002-11-04 Thread luehe 
luehe   2002/11/04 12:43:07

  Modified:jasper2/src/share/org/apache/jasper/compiler
DefaultErrorHandler.java
  Log:
  simplified impl of jspError() now that errMsg is always guaranteed to be non-null
  
  Revision  ChangesPath
  1.5   +6 -15 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
  
  Index: DefaultErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultErrorHandler.java  22 Oct 2002 21:59:57 -  1.4
  +++ DefaultErrorHandler.java  4 Nov 2002 20:43:07 -   1.5
   -91,13 +91,8 
*/
   public void jspError(String fname, int line, int column, String errMsg,
 Exception ex) throws JasperException {
  - if (errMsg != null) {
  - throw new JasperException(fname + ( + line + , + column + )
  -   +   + errMsg);
  - } else {
  - throw new JasperException(fname + ( + line + , + column + )
  -   +   + ex);
  - }
  + throw new JasperException(fname + ( + line + , + column + )
  +   +   + errMsg, ex);
   }
   
   /*
   -107,11 +102,7 
* param exception Parse exception
*/
   public void jspError(String errMsg, Exception ex) throws JasperException {
  - if (errMsg != null) {
  - throw new JasperException(errMsg);
  - } else {
  - throw new JasperException(ex);
  - }
  + throw new JasperException(errMsg, ex);
   }
   
   /*
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java

2002-10-22 Thread luehe 
luehe   2002/10/22 14:59:58

  Modified:jasper2/src/share/org/apache/jasper/compiler
DefaultErrorHandler.java
  Log:
  expose exception in error message
  
  Revision  ChangesPath
  1.4   +5 -5  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
  
  Index: DefaultErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultErrorHandler.java  7 Oct 2002 19:37:21 -   1.3
  +++ DefaultErrorHandler.java  22 Oct 2002 21:59:57 -  1.4
   -96,7 +96,7 
  +   + errMsg);
} else {
throw new JasperException(fname + ( + line + , + column + )
  -   +   + ex.getMessage());
  +   +   + ex);
}
   }
   
   -110,7 +110,7 
if (errMsg != null) {
throw new JasperException(errMsg);
} else {
  - throw new JasperException(ex.getMessage());
  + throw new JasperException(ex);
}
   }
   
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java ErrorDispatcher.java ErrorHandler.java TldLocationsCache.java

2002-10-07 Thread luehe 

luehe   2002/10/07 12:37:21

  Modified:jasper2/src/share/org/apache/jasper/compiler
DefaultErrorHandler.java ErrorDispatcher.java
ErrorHandler.java TldLocationsCache.java
  Log:
  Improved error reporting
  
  Revision  ChangesPath
  1.3   +17 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
  
  Index: DefaultErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultErrorHandler.java  24 Jul 2002 19:58:57 -  1.2
  +++ DefaultErrorHandler.java  7 Oct 2002 19:37:21 -   1.3
  @@ -101,6 +101,20 @@
   }
   
   /*
  + * Processes the given JSP parse error.
  + *
  + * @param errMsg Parse error message
  + * @param exception Parse exception
  + */
  +public void jspError(String errMsg, Exception ex) throws JasperException {
  + if (errMsg != null) {
  + throw new JasperException(errMsg);
  + } else {
  + throw new JasperException(ex.getMessage());
  + }
  +}
  +
  +/*
* Processes the given javac compilation errors.
*
* @param details Array of JavacErrorDetail instances corresponding to the
  
  
  
  1.5   +11 -4 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
  
  Index: ErrorDispatcher.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ErrorDispatcher.java  21 Aug 2002 16:21:56 -  1.4
  +++ ErrorDispatcher.java  7 Oct 2002 19:37:21 -   1.5
  @@ -412,6 +412,7 @@
String errMsg = null;
int line = -1;
int column = -1;
  + boolean hasLocation = false;
   
// Localize

  @@ -424,10 +425,12 @@
file = where.getFile();
line = where.getLineNumber();
column = where.getColumnNumber();
  + hasLocation = true;
} else if (e instanceof SAXParseException) {
file = ((SAXParseException) e).getSystemId();
line = ((SAXParseException) e).getLineNumber();
column = ((SAXParseException) e).getColumnNumber();
  + hasLocation = true;
}
   
// Get nested exception
  @@ -437,7 +440,11 @@
nestedEx = ((SAXException) e).getException();
}
   
  - errHandler.jspError(file, line, column, errMsg, nestedEx);
  + if (hasLocation) {
  + errHandler.jspError(file, line, column, errMsg, nestedEx);
  + } else {
  + errHandler.jspError(errMsg, nestedEx);
  + }
   }
   
   /*
  
  
  
  1.2   +12 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ErrorHandler.java 28 Mar 2002 18:46:18 -  1.1
  +++ ErrorHandler.java 7 Oct 2002 19:37:21 -   1.2
  @@ -88,6 +88,15 @@
 Exception exception) throws JasperException;
   
   /**
  + * Processes the given JSP parse error.
  + *
  + * @param errMsg Parse error message
  + * @param exception Parse exception
  + */
  +public void jspError(String msg, Exception exception)
  + throws JasperException;
  +
  +/**
* Processes the given javac compilation errors.
*
* @param details Array of JavacErrorDetail instances corresponding to the
  
  
  
  1.6   +8 -9  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
  
  Index: TldLocationsCache.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TldLocationsCache.java20 Aug 2002 03:52:18 -  1.5
  +++ TldLocationsCache.java7 Oct 2002 19:37:21 -   1.6
  @@ -253,16 +253,10 @@
   String name = entry.getName();
   if (!name.startsWith(META-INF/)) continue;
   if (!name.endsWith(.tld)) continue;
  -//p(tldConfigJar( + resourcePath +
  -//  ): Processing entry ' + name + ');
   stream = jarFile.getInputStream(entry);