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

2004-09-01 Thread remm 
remm2004/09/01 03:08:49

  Modified:jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java Localizer.java
  Added:   jasper2/src/share/org/apache/jasper/resources
LocalStrings_es.properties LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
  Removed: jasper2/src/share/org/apache/jasper/resources
messages_ja.properties messages.properties
messages_fr.properties messages_es.properties
  Log:
  - Rename Jasper resources, so that it's the same names as for the rest of Tomcat. 
It's easier for my i18n bundles.
  - I'll generate a _en bundle, which we could link to, and say please translate 
this ;)
  - We also need to overhaul the strings a little. I think there are likely 
discrepancies, and not everything is internationalized either.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties?rev=1.1
  
  
  1.1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties?rev=1.1
  
  
  1.1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1.1
  
  
  1.1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1.1
  
  
  1.24  +0 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java.diff?r1=1.23r2=1.24
  
  
  1.5   +10 -2 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java.diff?r1=1.4r2=1.5
  
  

-
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 ErrorDispatcher.java

2004-08-31 Thread yoavs 
yoavs   2004/08/31 16:52:59

  Modified:jasper2  build.xml
   jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java
  Log:
  Additional minor JavaDoc fixes.
  
  Revision  ChangesPath
  1.29  +2 -1  jakarta-tomcat-jasper/jasper2/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml 29 Aug 2004 18:15:03 -  1.28
  +++ build.xml 31 Aug 2004 23:52:59 -  1.29
  @@ -178,7 +178,8 @@
version=true
windowtitle=Jasper Internal API Documentation
doctitle=Jasper API
  - bottom=Copyright #169; 2000 Apache Software Foundation.  All Rights 
Reserved.
  + bottom=Copyright #169; 2000-2004 Apache Software Foundation.  All Rights 
Reserved.
  + additionalparam=-breakiterator
   /
 /target
   
  
  
  
  1.23  +1 -1  
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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ErrorDispatcher.java  16 Aug 2004 23:48:35 -  1.22
  +++ ErrorDispatcher.java  31 Aug 2004 23:52:59 -  1.23
  @@ -501,7 +501,7 @@
* @param page
* @param errMsgBuf
* @param lineNum
  - * @return
  + * @return JavacErrorDetail The error details
* @throws JasperException
*/
   public static JavacErrorDetail createJavacError(String fname, Node.Nodes page, 
  
  
  

-
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 ErrorDispatcher.java Generator.java JspConfig.java TagFileProcessor.java

2003-02-05 Thread luehe 
luehe   2003/02/05 15:35:22

  Modified:jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java Generator.java JspConfig.java
TagFileProcessor.java
  Log:
  Changed default for rtexprvalue for tag files from 'false' to 'true',
  as agreed by JSR-152-EG
  
  Revision  ChangesPath
  1.10  +4 -3  
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ErrorDispatcher.java  22 Jan 2003 20:08:24 -  1.9
  +++ ErrorDispatcher.java  5 Feb 2003 23:35:21 -   1.10
  @@ -303,6 +303,7 @@
*/
   public void javacError(String errMsg, String fname, Node.Nodes page)
throws JasperException, IOException {
  + System.out.println(LLL:  + errMsg);
JavacErrorDetail[] errDetails = parseJavacMessage(errMsg, fname, page);
errHandler.javacError(errDetails);
   }
  
  
  
  1.159 +5 -3  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- Generator.java31 Jan 2003 03:34:44 -  1.158
  +++ Generator.java5 Feb 2003 23:35:21 -   1.159
  @@ -3123,6 +3123,8 @@
   out.printil( throw (java.io.IOException) t; );
   out.printil( if( t instanceof javax.servlet.jsp.JspException ) );
   out.printil( throw (javax.servlet.jsp.JspException) t; );
  +out.printil( if( t instanceof IllegalArgumentException ) );
  +out.printil( throw (IllegalArgumentException) t; );
   out.printil(throw new javax.servlet.jsp.JspException(t); );
   out.popIndent();
   out.printil( } finally { );
  
  
  
  1.7   +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
  
  Index: JspConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspConfig.java22 Jan 2003 20:08:24 -  1.6
  +++ JspConfig.java5 Feb 2003 23:35:21 -   1.7
  @@ -208,7 +208,7 @@
   }
   
   /**
  - * Find a property that best match the supplied resource.
  + * Find a property that best matches the supplied resource.
* @param uri the resource supplied.
* @return a JspProperty if a match is found, null otherwise
*/
  
  
  
  1.39  +6 -3  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
  
  Index: TagFileProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- TagFileProcessor.java 28 Jan 2003 00:13:37 -  1.38
  +++ TagFileProcessor.java 5 Feb 2003 23:35:21 -   1.39
  @@ -179,8 +179,11 @@
   String attrName = n.getAttributeValue(name);
   boolean required = JspUtil.booleanValue(
n.getAttributeValue(required));
  +boolean rtexprvalue = true;
   String rtexprvalueString = n.getAttributeValue(rtexprvalue);
  -boolean rtexprvalue = JspUtil.booleanValue( rtexprvalueString );
  + if (rtexprvalueString != null) {
  + rtexprvalue = JspUtil.booleanValue( rtexprvalueString );
  + }
   boolean fragment = JspUtil.booleanValue(
n.getAttributeValue(fragment));
String type = n.getAttributeValue(type);
  
  
  

-
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 ErrorDispatcher.java Generator.java JspConfig.java

2003-02-05 Thread luehe 
luehe   2003/02/05 15:39:21

  Modified:jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java Generator.java JspConfig.java
  Log:
  Undid changes that were not supposed to be committed with previous putback
  
  Revision  ChangesPath
  1.11  +3 -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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ErrorDispatcher.java  5 Feb 2003 23:35:21 -   1.10
  +++ ErrorDispatcher.java  5 Feb 2003 23:39:20 -   1.11
  @@ -303,7 +303,6 @@
*/
   public void javacError(String errMsg, String fname, Node.Nodes page)
throws JasperException, IOException {
  - System.out.println(LLL:  + errMsg);
JavacErrorDetail[] errDetails = parseJavacMessage(errMsg, fname, page);
errHandler.javacError(errDetails);
   }
  
  
  
  1.160 +3 -5  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.159
  retrieving revision 1.160
  diff -u -r1.159 -r1.160
  --- Generator.java5 Feb 2003 23:35:21 -   1.159
  +++ Generator.java5 Feb 2003 23:39:20 -   1.160
  @@ -3123,8 +3123,6 @@
   out.printil( throw (java.io.IOException) t; );
   out.printil( if( t instanceof javax.servlet.jsp.JspException ) );
   out.printil( throw (javax.servlet.jsp.JspException) t; );
  -out.printil( if( t instanceof IllegalArgumentException ) );
  -out.printil( throw (IllegalArgumentException) t; );
   out.printil(throw new javax.servlet.jsp.JspException(t); );
   out.popIndent();
   out.printil( } finally { );
  
  
  
  1.8   +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
  
  Index: JspConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JspConfig.java5 Feb 2003 23:35:21 -   1.7
  +++ JspConfig.java5 Feb 2003 23:39:21 -   1.8
  @@ -208,7 +208,7 @@
   }
   
   /**
  - * Find a property that best matches the supplied resource.
  + * Find a property that best match the supplied resource.
* @param uri the resource supplied.
* @return a JspProperty if a match is found, null otherwise
*/
  
  
  

-
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 ErrorDispatcher.java

2002-12-11 Thread luehe 
luehe   2002/12/11 14:34:06

  Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
   jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java
  Log:
  Leverage ErrorDispatcher in JspRuntimeLibrary
  
  Revision  ChangesPath
  1.11  +42 -47
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
  
  Index: JspRuntimeLibrary.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JspRuntimeLibrary.java11 Dec 2002 19:40:45 -  1.10
  +++ JspRuntimeLibrary.java11 Dec 2002 22:34:06 -  1.11
  @@ -81,7 +81,7 @@
   import javax.servlet.jsp.tagext.BodyContent;
   
   import org.apache.jasper.JasperException;
  -import org.apache.jasper.Constants;
  +import org.apache.jasper.compiler.ErrorDispatcher;
   
   // for JSTL expression interpreter
   import javax.servlet.jsp.PageContext;
  @@ -100,6 +100,12 @@
*/
   public class JspRuntimeLibrary {
   
  +private static ErrorDispatcher err;
  +
  +static {
  + err = new ErrorDispatcher();
  +}
  +
   protected static class PrivilegedIntrospectHelper
implements PrivilegedExceptionAction {
   
  @@ -130,15 +136,15 @@
   }
   
   public static Character getCharacter(String s) throws JasperException {
  - if (s.length()  0) {
  - return new Character(s.charAt(0));
  - } else {
  - throw new 
JasperException(Constants.getString(jsp.error.bad_string_Character));
  + if (s.length() == 0) {
  + err.jspError(jsp.error.bad_string_Character);
}
  + return new Character(s.charAt(0));
   }
   
  // __begin convertMethod
  -public static Object convert(String propertyName, String s, Class t, Class 
propertyEditorClass) 
  +public static Object convert(String propertyName, String s, Class t,
  +  Class propertyEditorClass) 
  throws JasperException 
   {
   try {
  @@ -248,10 +254,8 @@
if ( method != null ) {
if (type.isArray()) {
   if (request == null) {
  -throw new JasperException(Constants.getString(
  -jsp.error.beans.setproperty.noindexset,
  -new Object[] {}));
  -};
  +err.jspError(jsp.error.beans.setproperty.noindexset);
  +}
Class t = type.getComponentType();
String[] values = request.getParameterValues(param);
//XXX Please check.
  @@ -275,14 +279,11 @@
}
   if (!ignoreMethodNF  (method == null)) {
   if (type == null) {
  -throw new JasperException(Constants.getString(
  -jsp.error.beans.noproperty,
  -new Object[] {prop, bean.getClass().getName()}));
  +err.jspError(jsp.error.beans.noproperty,
  +  prop, bean.getClass().getName());
   } else {
  -throw new JasperException(Constants.getString(
  -jsp.error.beans.nomethod.setproperty,
  -new Object[] {prop, type.getName(),
  -   bean.getClass().getName()}));
  + err.jspError(jsp.error.beans.nomethod.setproperty,
  +  prop, type.getName(), bean.getClass().getName());
   }
   }
   }
  @@ -336,16 +337,19 @@
* the request and the property is indexed.
*/
   public static void createTypedArray(String propertyName,
  - Object bean, Method method, String []values, 
Class t,
  + Object bean,
  + Method method,
  + String[] values,
  + Class t,
Class propertyEditorClass)
  -throws JasperException {
  + throws JasperException {
  +
try {
if (propertyEditorClass != null) {
Object[] tmpval = new Integer[values.length];
for (int i=0; ivalues.length; i++) {
  - tmpval[i] =  
  - getValueFromBeanInfoPropertyEditor(
  -t, propertyName, values[i], 
propertyEditorClass);
  + tmpval[i] = getValueFromBeanInfoPropertyEditor(
  +t, propertyName, values[i], propertyEditorClass);
}
method.invoke (bean, new Object[]