costin 01/06/12 08:04:15 Modified: jasper34/generator/org/apache/jasper34/core ContainerLiaison.java Log: Moved the methods from Constants. TODO: change them from static to instance ( after JspServlet is refactored ). messages are normal callback. getString() used to be a callback and we'll keep it that way ( StringManager remains the default impl., but containers may use different internationalization schemes and we shouldn't force StringManager and properties ). Revision Changes Path 1.4 +45 -7 jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/ContainerLiaison.java Index: ContainerLiaison.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/ContainerLiaison.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ContainerLiaison.java 2001/06/07 07:02:25 1.3 +++ ContainerLiaison.java 2001/06/12 15:04:12 1.4 @@ -70,7 +70,7 @@ /** - * The container can override this to provide services to jasper. + * The container must override this to provide services to jasper. * * * @author Anil K. Vijendran @@ -89,8 +89,16 @@ liaison=l; } - // -------------------- resource access -------------------- + // -------------------- Options -------------------- + /** + * Get hold of the Options object for this context. + */ + public abstract Options getOptions(); + + + // -------------------- resource access -------------------- + /** * Get the full value of a URI relative to this compilations context */ @@ -154,18 +162,22 @@ // -------------------- messages -------------------- + // XXX TODO + /** * Get hold of a "message" or any string from our resources * database. */ - public String getString(String key) { + public static String getString(String key) { return getString(key, null); } /** * Format the string that is looked up using "key" using "args". */ - public abstract String getString(String key, Object[] args); + public static String getString(String key, Object[] args) { + return resources.getString(key,args); + } /** @@ -178,7 +190,9 @@ * appropriate for the current verbosity * level. */ - public abstract void message(String key, int verbosityLevel); + public static void message(String key, int verbosityLevel) { + message( key, null, verbosityLevel ); + } /** @@ -191,8 +205,32 @@ * appropriate for the current verbosity * level. */ - public abstract void message(String key, Object[] args, - int verbosityLevel); + public static void message(String key, Object[] args, int verbosityLevel) { + if (jasperLog == null) + jasperLog = Log.getLog("JASPER_LOG", null); + + if (jasperLog != null){ + String msg = getString(key,args); + msg=(msg==null)?key:msg; + jasperLog.log(msg, verbosityLevel); + } + } + + // -------------------- Implementation -------------------- + // XXX will be moved to base impl. + + public void setLog( Log l ) { + jasperLog=l; + } + /** + * This is where all our error messages and such are stored. + */ + private static StringManager resources= + StringManager.getManager("org.apache.jasper34.runtime.res"); + + private static Log jasperLog = null; + + }