luehe       2004/02/20 14:10:21

  Modified:    catalina/src/share/org/apache/catalina/valves
                        ErrorReportValve.java LocalStrings.properties
                        LocalStrings_es.properties
                        LocalStrings_fr.properties
                        LocalStrings_ja.properties
  Log:
  Leverage configured server.info in error message
  
  Revision  Changes    Path
  1.14      +6 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
  
  Index: ErrorReportValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ErrorReportValve.java     1 Jan 2004 23:53:46 -0000       1.13
  +++ ErrorReportValve.java     20 Feb 2004 22:10:21 -0000      1.14
  @@ -343,7 +343,8 @@
               sb.append("<p><b>");
               sb.append(sm.getString("errorReportValve.note"));
               sb.append("</b> <u>");
  -            sb.append(sm.getString("errorReportValve.rootCauseInLogs"));
  +            sb.append(sm.getString("errorReportValve.rootCauseInLogs",
  +                                   ServerInfo.getServerInfo()));
               sb.append("</u></p>");
   
           }
  
  
  
  1.7       +1 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LocalStrings.properties   19 Nov 2003 23:56:14 -0000      1.6
  +++ LocalStrings.properties   20 Feb 2004 22:10:21 -0000      1.7
  @@ -22,7 +22,7 @@
   errorReportValve.exception=exception
   errorReportValve.rootCause=root cause
   errorReportValve.note=note
  -errorReportValve.rootCauseInLogs=The full stack trace of the root cause is 
available in the Tomcat logs.
  +errorReportValve.rootCauseInLogs=The full stack trace of the root cause is 
available in the {0} logs.
   
   # HTTP status reports
   http.100=The client may continue ({0}).
  
  
  
  1.4       +1 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties
  
  Index: LocalStrings_es.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_es.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalStrings_es.properties        17 Jan 2004 01:43:58 -0000      1.3
  +++ LocalStrings_es.properties        20 Feb 2004 22:10:21 -0000      1.4
  @@ -22,7 +22,7 @@
   errorReportValve.exception=excepción
   errorReportValve.rootCause=causa raíz
   errorReportValve.note=nota
  -errorReportValve.rootCauseInLogs=La traza completa de la causa de este error se 
encuentra en los archivos de diario de Tomcat.
  +errorReportValve.rootCauseInLogs=La traza completa de la causa de este error se 
encuentra en los archivos de diario de {0}.
   
   # HTTP status reports
   http.100=El cliente puede continuar ({0}).
  
  
  
  1.4       +1 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties
  
  Index: LocalStrings_fr.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalStrings_fr.properties        19 Jul 2003 10:14:17 -0000      1.3
  +++ LocalStrings_fr.properties        20 Feb 2004 22:10:21 -0000      1.4
  @@ -20,7 +20,7 @@
   errorReportValve.exception=exception
   errorReportValve.rootCause=cause mère
   errorReportValve.note=note
  -errorReportValve.rootCauseInLogs=La trace complète de la cause mère de cette erreur 
est disponible dans les fichiers journaux de Tomcat.
  +errorReportValve.rootCauseInLogs=La trace complète de la cause mère de cette erreur 
est disponible dans les fichiers journaux de {0}.
   
   # HTTP status reports
   http.100=Le client peut continuer ({0}).
  
  
  
  1.4       +1 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
  
  Index: LocalStrings_ja.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalStrings_ja.properties        1 Dec 2003 21:34:00 -0000       1.3
  +++ LocalStrings_ja.properties        20 Feb 2004 22:10:21 -0000      1.4
  @@ -21,4 +21,4 @@
   errorReportValve.exception=\u4f8b\u5916
   errorReportValve.rootCause=\u539f\u56e0
   errorReportValve.note=\u6ce8\u610f
  
-errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001Tomcat\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
  
+errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001{0}\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
  
  
  

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

Reply via email to