Menu
▾
▴
webmacro-cvs — receive cvs commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(97) |
Dec
(35) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(12) |
Feb
(55) |
Mar
(21) |
Apr
(3) |
May
(7) |
Jun
(25) |
Jul
(108) |
Aug
(23) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
(6) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(13) |
Feb
|
Mar
(257) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(38) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(63) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tim P <ti...@us...> - 2008-03-18 21:28:45
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30439/src/org/webmacro/servlet Modified Files: TemplateServlet.java Log Message: Checkstyle: Organise imports Index: TemplateServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TemplateServlet.java 31 Oct 2005 02:46:41 -0000 1.9 --- TemplateServlet.java 18 Mar 2008 21:28:42 -0000 1.10 *************** *** 21,28 **** package org.webmacro.servlet; ! import javax.servlet.http.*; ! import javax.servlet.*; ! import org.webmacro.*; ! import org.webmacro.util.*; /** --- 21,34 ---- package org.webmacro.servlet; ! import javax.servlet.ServletConfig; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServlet; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! ! import org.webmacro.Context; ! import org.webmacro.Log; ! import org.webmacro.util.Settings; ! import org.webmacro.util.WMEval; /** |
|
From: Tim P <ti...@us...> - 2008-03-18 21:23:58
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28378/src/org/webmacro/servlet Modified Files: WMServlet.java Log Message: Checkstyle: Organise imports Index: WMServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** WMServlet.java 28 Jan 2008 16:00:01 -0000 1.63 --- WMServlet.java 18 Mar 2008 21:23:53 -0000 1.64 *************** *** 24,29 **** package org.webmacro.servlet; ! import org.webmacro.*; ! import org.webmacro.util.LogSystem; import javax.servlet.ServletConfig; --- 24,33 ---- package org.webmacro.servlet; ! import java.io.IOException; ! import java.io.OutputStream; ! import java.io.UnsupportedEncodingException; ! import java.io.Writer; ! import java.lang.reflect.Method; ! import java.util.Locale; import javax.servlet.ServletConfig; *************** *** 32,38 **** import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; ! import java.io.*; ! import java.lang.reflect.Method; ! import java.util.Locale; /** --- 36,53 ---- import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; ! ! import org.webmacro.Broker; ! import org.webmacro.Context; ! import org.webmacro.FastWriter; ! import org.webmacro.InitException; ! import org.webmacro.Log; ! import org.webmacro.NotFoundException; ! import org.webmacro.PropertyException; ! import org.webmacro.ResourceException; ! import org.webmacro.Template; ! import org.webmacro.WM; ! import org.webmacro.WMConstants; ! import org.webmacro.WebMacro; ! import org.webmacro.util.LogSystem; /** *************** *** 720,725 **** new Class[] {Locale.class}); ! m.invoke(resp, (Object[])new Locale[] ! {locale}); if (_log.loggingDebug()) _log.debug("Successfully set locale to " + locale); --- 735,739 ---- new Class[] {Locale.class}); ! m.invoke(resp, (Object[])new Locale[]{locale}); if (_log.loggingDebug()) _log.debug("Successfully set locale to " + locale); |
|
From: Tim P <ti...@us...> - 2008-03-18 21:01:11
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17708/src/org/webmacro/parser Modified Files: WMParser_impl.jj Log Message: Explicit imports Index: WMParser_impl.jj =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.jj,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** WMParser_impl.jj 18 Mar 2008 11:14:13 -0000 1.53 --- WMParser_impl.jj 18 Mar 2008 21:01:01 -0000 1.54 *************** *** 5,19 **** package org.webmacro.parser; ! import java.util.*; ! import java.io.*; ! import org.webmacro.*; ! import org.webmacro.engine.*; ! import org.webmacro.directive.*; import org.webmacro.directive.Directive; ! import org.webmacro.directive.DirectiveProvider; import org.webmacro.directive.DirectiveBuilder; import org.webmacro.directive.Directive.ArgDescriptor; import org.webmacro.directive.Directive.OptionChoice; import org.webmacro.directive.Directive.Subdirective; /** --- 5,37 ---- package org.webmacro.parser; ! import java.io.FileReader; ! import java.io.InputStreamReader; ! import java.util.ArrayList; ! import java.util.Stack; ! ! import org.webmacro.Broker; ! import org.webmacro.Context; ! import org.webmacro.WM; import org.webmacro.directive.Directive; ! import org.webmacro.directive.DirectiveArgs; import org.webmacro.directive.DirectiveBuilder; + import org.webmacro.directive.DirectiveDescriptor; + import org.webmacro.directive.DirectiveProvider; import org.webmacro.directive.Directive.ArgDescriptor; import org.webmacro.directive.Directive.OptionChoice; import org.webmacro.directive.Directive.Subdirective; + import org.webmacro.engine.Block; + import org.webmacro.engine.BlockBuilder; + import org.webmacro.engine.BuildContext; + import org.webmacro.engine.BuildException; + import org.webmacro.engine.Builder; + import org.webmacro.engine.Expression; + import org.webmacro.engine.FunctionCallBuilder; + import org.webmacro.engine.ListBuilder; + import org.webmacro.engine.MacroBuilder; + import org.webmacro.engine.MapBuilder; + import org.webmacro.engine.PropertyMethodBuilder; + import org.webmacro.engine.QuotedStringBuilder; + import org.webmacro.engine.VariableBuilder; /** |
|
From: Tim P <ti...@us...> - 2008-03-18 21:00:53
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17507/src/org/webmacro/parser Modified Files: WMParser_impl.java Log Message: Organise imports (also fed into .jj) Index: WMParser_impl.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** WMParser_impl.java 18 Mar 2008 11:44:33 -0000 1.58 --- WMParser_impl.java 18 Mar 2008 21:00:41 -0000 1.59 *************** *** 2,16 **** package org.webmacro.parser; ! import java.util.*; ! import java.io.*; ! import org.webmacro.*; ! import org.webmacro.engine.*; ! import org.webmacro.directive.*; import org.webmacro.directive.Directive; ! import org.webmacro.directive.DirectiveProvider; import org.webmacro.directive.DirectiveBuilder; import org.webmacro.directive.Directive.ArgDescriptor; import org.webmacro.directive.Directive.OptionChoice; import org.webmacro.directive.Directive.Subdirective; /** --- 2,34 ---- package org.webmacro.parser; ! import java.io.FileReader; ! import java.io.InputStreamReader; ! import java.util.ArrayList; ! import java.util.Stack; ! ! import org.webmacro.Broker; ! import org.webmacro.Context; ! import org.webmacro.WM; import org.webmacro.directive.Directive; ! import org.webmacro.directive.DirectiveArgs; import org.webmacro.directive.DirectiveBuilder; + import org.webmacro.directive.DirectiveDescriptor; + import org.webmacro.directive.DirectiveProvider; import org.webmacro.directive.Directive.ArgDescriptor; import org.webmacro.directive.Directive.OptionChoice; import org.webmacro.directive.Directive.Subdirective; + import org.webmacro.engine.Block; + import org.webmacro.engine.BlockBuilder; + import org.webmacro.engine.BuildContext; + import org.webmacro.engine.BuildException; + import org.webmacro.engine.Builder; + import org.webmacro.engine.Expression; + import org.webmacro.engine.FunctionCallBuilder; + import org.webmacro.engine.ListBuilder; + import org.webmacro.engine.MacroBuilder; + import org.webmacro.engine.MapBuilder; + import org.webmacro.engine.PropertyMethodBuilder; + import org.webmacro.engine.QuotedStringBuilder; + import org.webmacro.engine.VariableBuilder; /** |
|
From: Tim P <ti...@us...> - 2008-03-18 20:48:23
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11228/src/org/webmacro Modified Files: URLTemplateLoader.java Log Message: Checkstyle: redundant imports Index: URLTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/URLTemplateLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** URLTemplateLoader.java 28 Jan 2008 16:03:28 -0000 1.2 --- URLTemplateLoader.java 18 Mar 2008 20:48:17 -0000 1.3 *************** *** 23,34 **** package org.webmacro; ! import org.webmacro.ResourceException; ! import org.webmacro.Template; import org.webmacro.resource.AbstractTemplateLoader; import org.webmacro.resource.CacheElement; - import java.net.URL; - import java.net.MalformedURLException; - /** * Implementation of TemplateLoader that loads templates from a given URL. --- 23,32 ---- package org.webmacro; ! import java.net.MalformedURLException; ! import java.net.URL; ! import org.webmacro.resource.AbstractTemplateLoader; import org.webmacro.resource.CacheElement; /** * Implementation of TemplateLoader that loads templates from a given URL. |
|
From: Tim P <ti...@us...> - 2008-03-18 20:46:06
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10074/src/org/webmacro/adapter/jsp Modified Files: TemplateTag.java Log Message: Checkstyle: whitespace Index: TemplateTag.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp/TemplateTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TemplateTag.java 17 Mar 2008 12:23:44 -0000 1.4 --- TemplateTag.java 18 Mar 2008 20:46:01 -0000 1.5 *************** *** 142,147 **** final ClassLoader classLoader = pageContext.getPage().getClass().getClassLoader(); ! return new WM( pageContext.getServletContext(), ! classLoader, null ); } --- 142,147 ---- final ClassLoader classLoader = pageContext.getPage().getClass().getClassLoader(); ! return new WM(pageContext.getServletContext(), ! classLoader, null); } *************** *** 219,227 **** if (context instanceof Map) { ! webContext.putAll( (Map) context); } else { ! webContext.put( CONTEXT_VARIABLE_NAME, context); } } --- 219,227 ---- if (context instanceof Map) { ! webContext.putAll((Map) context); } else { ! webContext.put(CONTEXT_VARIABLE_NAME, context); } } *************** *** 230,234 **** * Add the scoped attribute helper */ ! webContext.put( ATTRIBUTES_HELPER_NAME, new JSPAttributes(pageContext)); Template templ = null; --- 230,234 ---- * Add the scoped attribute helper */ ! webContext.put(ATTRIBUTES_HELPER_NAME, new JSPAttributes(pageContext)); Template templ = null; |
|
From: Tim P <ti...@us...> - 2008-03-18 20:10:18
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/broker In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28259/src/org/webmacro/broker Modified Files: DefaultContextAutoLoader.java Log Message: Checkstyle: Organise imports Index: DefaultContextAutoLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/broker/DefaultContextAutoLoader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultContextAutoLoader.java 30 Jul 2003 04:51:17 -0000 1.1 --- DefaultContextAutoLoader.java 18 Mar 2008 20:10:15 -0000 1.2 *************** *** 2,6 **** import java.lang.reflect.Constructor; ! import java.util.*; import org.webmacro.Broker; --- 2,6 ---- import java.lang.reflect.Constructor; ! import java.util.Map; import org.webmacro.Broker; *************** *** 9,12 **** --- 9,13 ---- import org.webmacro.PropertyException; import org.webmacro.util.Settings; + import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; |
|
From: Tim P <ti...@us...> - 2008-03-18 20:09:08
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27440/src/org/webmacro/resource Modified Files: BrokerTemplateLoader.java Log Message: Checkstyle: class javadoc attribution from CVS log Index: BrokerTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateLoader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BrokerTemplateLoader.java 12 Jun 2003 00:47:47 -0000 1.4 --- BrokerTemplateLoader.java 18 Mar 2008 20:08:58 -0000 1.5 *************** *** 27,30 **** --- 27,34 ---- import java.net.URL; + /** + * @author sk + * @since 03 Feb 2002 + */ public class BrokerTemplateLoader extends AbstractTemplateLoader { |
|
From: Tim P <ti...@us...> - 2008-03-18 20:04:53
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25732/src/org/webmacro/servlet Modified Files: ListUtil.java Log Message: Checkstyle: Organise imports Index: ListUtil.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ListUtil.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ListUtil.java 31 Oct 2005 02:46:41 -0000 1.12 --- ListUtil.java 18 Mar 2008 20:04:42 -0000 1.13 *************** *** 23,31 **** package org.webmacro.servlet; ! import java.util.*; /** * A utility class for templates loaded into the context as "List" by ListTool. ! * It allows template designers to work with Java arrays and lists using * without having to distinguish between them. * --- 23,37 ---- package org.webmacro.servlet; ! import java.util.ArrayList; ! import java.util.Arrays; ! import java.util.Enumeration; ! import java.util.Iterator; ! import java.util.List; ! import java.util.ListIterator; ! import java.util.StringTokenizer; /** * A utility class for templates loaded into the context as "List" by ListTool. ! * It allows template designers to work with Java arrays and lists * without having to distinguish between them. * |
|
From: Tim P <ti...@us...> - 2008-03-18 20:03:26
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24940/src/org/webmacro/directive Modified Files: BeanDirective.java Log Message: Checkstyle: Organise imports Index: BeanDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/BeanDirective.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BeanDirective.java 1 Nov 2005 04:08:04 -0000 1.15 --- BeanDirective.java 18 Mar 2008 20:03:13 -0000 1.16 *************** *** 27,39 **** */ - import org.webmacro.*; - import org.webmacro.engine.*; - import org.webmacro.util.Instantiator; - import java.io.IOException; import java.util.HashMap; import java.util.Map; /** ! * Implements a directive allowing a script writer * to instantiate an arbitrary * java object in a WebMacro template subject to --- 27,52 ---- */ import java.io.IOException; import java.util.HashMap; import java.util.Map; + + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Log; + import org.webmacro.Macro; + import org.webmacro.PropertyException; + import org.webmacro.TemplateVisitor; + import org.webmacro.WebMacroException; + import org.webmacro.engine.Block; + import org.webmacro.engine.BuildContext; + import org.webmacro.engine.BuildException; + import org.webmacro.engine.Builder; + import org.webmacro.engine.UndefinedMacro; + import org.webmacro.engine.Variable; + import org.webmacro.util.Instantiator; + /** ! * Implements a directive allowing a script writer * to instantiate an arbitrary * java object in a WebMacro template subject to |
|
From: Tim P <ti...@us...> - 2008-03-18 20:01:45
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23346/src/org/webmacro/util Modified Files: LogSystem.java Log Message: Checkstyle: Organise imports Index: LogSystem.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogSystem.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LogSystem.java 16 Jul 2003 06:45:00 -0000 1.7 --- LogSystem.java 18 Mar 2008 20:01:40 -0000 1.8 *************** *** 24,30 **** package org.webmacro.util; ! import org.webmacro.Log; ! import java.util.*; /** --- 24,34 ---- package org.webmacro.util; ! import java.util.HashMap; ! import java.util.HashSet; ! import java.util.Iterator; ! import java.util.Map; ! import java.util.Set; ! import org.webmacro.Log; /** *************** *** 93,97 **** /** ! * Get the global, system-wide, default log system */ public static LogSystem getInstance () --- 97,101 ---- /** ! * Get the global, system-wide, default log system. */ public static LogSystem getInstance () *************** *** 101,105 **** /** ! * Get a system-wide log */ public static Log getSystemLog (String type) --- 105,109 ---- /** ! * Get a system-wide log. */ public static Log getSystemLog (String type) *************** *** 109,113 **** /** ! * Get a system log, providing it with a description of itself */ public static Log getSystemLog (String type, String description) --- 113,117 ---- /** ! * Get a system log, providing it with a description of itself. */ public static Log getSystemLog (String type, String description) *************** *** 271,275 **** /** ! * Flush all of the LogTarget objects in the system */ synchronized public void flush () --- 275,279 ---- /** ! * Flush all of the LogTarget objects in the system. */ synchronized public void flush () *************** *** 285,289 **** /** ! * Test out the logging system */ public static void main (String arg[]) throws Exception --- 289,293 ---- /** ! * Test out the logging system. */ public static void main (String arg[]) throws Exception |
|
From: Tim P <ti...@us...> - 2008-03-18 19:59:52
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21738/src/org/webmacro/util Modified Files: CastUtil.java Log Message: Eclipse: object cannot be null Index: CastUtil.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/CastUtil.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CastUtil.java 18 Mar 2008 19:57:47 -0000 1.13 --- CastUtil.java 18 Mar 2008 19:59:48 -0000 1.14 *************** *** 63,68 **** { throw new IllegalArgumentException( ! "Not a valid char: " + ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } } --- 63,68 ---- { throw new IllegalArgumentException( ! "Not a valid char: " + ! o.toString() + "; type=" + o.getClass().getName()); } } |
|
From: Tim P <ti...@us...> - 2008-03-18 19:57:52
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20372/src/org/webmacro/util Modified Files: CastUtil.java Log Message: Checkstyle: Make final and line length Index: CastUtil.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/CastUtil.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CastUtil.java 17 Mar 2008 12:26:50 -0000 1.12 --- CastUtil.java 18 Mar 2008 19:57:47 -0000 1.13 *************** *** 24,31 **** /** * A singleton for casting one type to another. * @author keats_kirsch * @since 0.96 */ ! public class CastUtil { --- 24,32 ---- /** * A singleton for casting one type to another. + * * @author keats_kirsch * @since 0.96 */ ! public final class CastUtil { *************** *** 37,41 **** } ! static public CastUtil getInstance () { return _singleton; --- 38,42 ---- } ! public static CastUtil getInstance () { return _singleton; *************** *** 61,65 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid char: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } } --- 62,68 ---- catch (Exception e) { ! throw new IllegalArgumentException( ! "Not a valid char: " + ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } } *************** *** 82,86 **** { // throw exception throw new org.webmacro.PropertyException( ! "$Type.toChar() is unable to convert the supplied value to a Character. The argument" + " must be a number or a String. The supplied argument was " + o + " of type " + o.getClass().getName()); --- 85,90 ---- { // throw exception throw new org.webmacro.PropertyException( ! "$Type.toChar() is unable to convert the supplied value to a Character." + ! " The argument" + " must be a number or a String. The supplied argument was " + o + " of type " + o.getClass().getName()); *************** *** 100,104 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid byte: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } return v; --- 104,110 ---- catch (Exception e) { ! throw new IllegalArgumentException("Not a valid byte: " + ! ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } return v; *************** *** 116,120 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid short: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } return v; --- 122,128 ---- catch (Exception e) { ! throw new IllegalArgumentException("Not a valid short: " + ! ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } return v; *************** *** 131,135 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid int: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } return i; --- 139,146 ---- catch (Exception e) { ! throw new IllegalArgumentException( ! "Not a valid int: " + ! ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } return i; *************** *** 146,150 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid long: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } return l; --- 157,163 ---- catch (Exception e) { ! throw new IllegalArgumentException("Not a valid long: " + ! ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } return l; *************** *** 161,165 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid float: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } return f; --- 174,180 ---- catch (Exception e) { ! throw new IllegalArgumentException( ! "Not a valid float: " + ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } return f; *************** *** 176,180 **** catch (Exception e) { ! throw new IllegalArgumentException("Not a valid double: " + ((o == null) ? "null" : (o.toString() + "; type=" + o.getClass().getName()))); } return d; --- 191,197 ---- catch (Exception e) { ! throw new IllegalArgumentException( ! "Not a valid double: " + ((o == null) ? "null" : ! (o.toString() + "; type=" + o.getClass().getName()))); } return d; |
|
From: Tim P <ti...@us...> - 2008-03-18 19:52:40
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18238/src/org/webmacro/directive Modified Files: WhileDirective.java Log Message: Organise imports, format Index: WhileDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/WhileDirective.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WhileDirective.java 28 Oct 2005 19:10:12 -0000 1.1 --- WhileDirective.java 18 Mar 2008 19:52:21 -0000 1.2 *************** *** 18,31 **** package org.webmacro.directive; - import org.webmacro.*; - import org.webmacro.engine.*; - import java.io.IOException; /** ! * Syntax: #while (condition) [limit (int)] { block } WhileDirective implements a WebMacro directive for an while ! * control structure. If you use it without the limit option than it stops after 1000000 loops! ! * Use a limit value < 0 to create a loop without a limit, this could hang your template! ! * Introduced at release 2.0 as an experimental directive. * <pre> * TODO: Introduce unit test and mainline or drop the directive. --- 18,41 ---- package org.webmacro.directive; import java.io.IOException; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Macro; + import org.webmacro.PropertyException; + import org.webmacro.TemplateVisitor; + import org.webmacro.engine.Block; + import org.webmacro.engine.BuildContext; + import org.webmacro.engine.BuildException; + import org.webmacro.engine.Expression; + import org.webmacro.engine.UndefinedMacro; + /** ! * Syntax: #while (condition) [limit (int)] { block } WhileDirective implements ! * a WebMacro directive for an while control structure. If you use it without ! * the limit option than it stops after 1000000 loops! Use a limit value < 0 to ! * create a loop without a limit, this could hang your template! Introduced at ! * release 2.0 as an experimental directive. ! * * <pre> * TODO: Introduce unit test and mainline or drop the directive. *************** *** 36,166 **** class WhileDirective extends Directive { ! private static final int WHILE_COND = 1; ! private static final int WHILE_LIMIT_K = 2; ! private static final int WHILE_LIMIT = 3; ! private static final int WHILE_BLOCK = 4; ! /* the condition as Object */ private Object _obCondition; ! ! /* the condition as a Macro */ ! private Macro _macroCondition = null; /* the condition as a boolean */ ! private boolean boolExpression = false; ! private Block _whileBlock; ! private Object _limitExpr; ! private static final UndefinedMacro UNDEF = UndefinedMacro.getInstance(); ! private static final ArgDescriptor[] ifArgs = new ArgDescriptor[] { new ConditionArg( WHILE_COND ), ! new OptionalGroup( 2 ), new KeywordArg( WHILE_LIMIT_K, "limit" ), new RValueArg( WHILE_LIMIT ), ! new BlockArg( WHILE_BLOCK ), }; ! private static final DirectiveDescriptor _desc = new DirectiveDescriptor( "while", null, ifArgs, null ); ! public static DirectiveDescriptor getDescriptor() ! { ! return _desc; ! } ! // ! // these values are customized for this directive during build() ! // ! /** ! * the name given to the directive by webmacro configuration. ! */ ! protected String _directiveName; ! public Object build( DirectiveBuilder builder, BuildContext bc ) throws BuildException ! { ! // name of this directive. ! _directiveName = builder.getName(); ! // While condition. ! _obCondition = builder.getArg( WHILE_COND, bc ); ! ! if (_obCondition instanceof Macro) ! { ! _macroCondition = (Macro) _obCondition; ! } ! else if (_obCondition instanceof Boolean) ! { ! boolExpression = Expression.isTrue(_obCondition); ! } ! else ! { ! // No valid condition! ! throw new BuildException("#" + _directiveName + ": does not provide a valid condition!"); ! } ! // While limit (number). ! _limitExpr = builder.getArg( WHILE_LIMIT, bc ); ! // While block. ! _whileBlock = (Block) builder.getArg( WHILE_BLOCK, bc ); ! return this; ! } ! public void write( FastWriter out, Context context ) throws PropertyException, IOException ! { ! Object limit; ! int loopLimit = 1000000, loopIndex = 0; ! if ( _limitExpr != null ) ! { ! limit = _limitExpr; ! while ( limit instanceof Macro && limit != UNDEF ) ! { ! limit = ( (Macro) limit ).evaluate( context ); ! } ! if ( Expression.isNumber( limit ) ) ! { ! loopLimit = (int) Expression.numberValue( limit ); ! } ! else ! { ! String warning = "#" + _directiveName + ": Cannot evaluate limit"; ! writeWarning( warning, context, out ); ! } ! } ! // evaluate the condition against the current context. ! if (_macroCondition != null) boolExpression = Expression.isTrue( _macroCondition.evaluate( context ) ); ! // while the expression is true and loopLimit <0 or loopIndex < loopLimit not exeeded. ! while ( ( boolExpression ) && ( ( loopLimit < 0 ) || ( loopIndex < loopLimit ) ) ) ! { ! _whileBlock.write( out, context ); ! // evaluate the condition against the current context. ! if (_macroCondition != null) boolExpression = Expression.isTrue( _macroCondition.evaluate( context ) ); ! ++loopIndex; ! } ! if ( loopIndex >= loopLimit ) ! { ! // exeeded the limit! ! String warning = "#" + _directiveName + ": exeeded the limit of " + loopLimit; ! writeWarning( warning, context, out ); ! } ! } ! public void accept( TemplateVisitor v ) ! { ! v.beginDirective( _desc.name ); ! v.visitDirectiveArg( "WhileCondition", _macroCondition ); ! v.visitDirectiveArg( "WhileBlock", _whileBlock ); ! if ( _limitExpr != null ) ! v.visitDirectiveArg( "WhileLimit", _limitExpr ); ! v.endDirective(); ! } } \ No newline at end of file --- 46,176 ---- class WhileDirective extends Directive { ! private static final int WHILE_COND = 1; ! private static final int WHILE_LIMIT_K = 2; ! private static final int WHILE_LIMIT = 3; ! private static final int WHILE_BLOCK = 4; ! /* the condition as Object */ private Object _obCondition; ! ! /* the condition as a Macro */ ! private Macro _macroCondition = null; /* the condition as a boolean */ ! private boolean boolExpression = false; ! private Block _whileBlock; ! private Object _limitExpr; ! private static final UndefinedMacro UNDEF = UndefinedMacro.getInstance(); ! private static final ArgDescriptor[] ifArgs = new ArgDescriptor[] { ! new ConditionArg(WHILE_COND), new OptionalGroup(2), ! new KeywordArg(WHILE_LIMIT_K, "limit"), new RValueArg(WHILE_LIMIT), ! new BlockArg(WHILE_BLOCK), }; ! private static final DirectiveDescriptor _desc = new DirectiveDescriptor( ! "while", null, ifArgs, null); ! public static DirectiveDescriptor getDescriptor () ! { ! return _desc; ! } ! // ! // these values are customized for this directive during build() ! // ! /** ! * the name given to the directive by webmacro configuration. ! */ ! protected String _directiveName; ! public Object build (DirectiveBuilder builder, BuildContext bc) ! throws BuildException ! { ! // name of this directive. ! _directiveName = builder.getName(); ! // While condition. ! _obCondition = builder.getArg(WHILE_COND, bc); ! if (_obCondition instanceof Macro) { ! _macroCondition = (Macro) _obCondition; ! } else if (_obCondition instanceof Boolean) { ! boolExpression = Expression.isTrue(_obCondition); ! } else { ! // No valid condition! ! throw new BuildException("#" + _directiveName ! + ": does not provide a valid condition!"); ! } ! // While limit (number). ! _limitExpr = builder.getArg(WHILE_LIMIT, bc); ! // While block. ! _whileBlock = (Block) builder.getArg(WHILE_BLOCK, bc); ! return this; ! } ! public void write (FastWriter out, Context context) ! throws PropertyException, IOException ! { ! Object limit; ! int loopLimit = 1000000, loopIndex = 0; ! if (_limitExpr != null) { ! limit = _limitExpr; ! while (limit instanceof Macro && limit != UNDEF) { ! limit = ((Macro) limit).evaluate(context); ! } ! if (Expression.isNumber(limit)) { ! loopLimit = (int) Expression.numberValue(limit); ! } else { ! String warning = "#" + _directiveName ! + ": Cannot evaluate limit"; ! writeWarning(warning, context, out); ! } ! } ! // evaluate the condition against the current context. ! if (_macroCondition != null) ! boolExpression = Expression.isTrue(_macroCondition ! .evaluate(context)); ! // while the expression is true and loopLimit <0 or loopIndex < ! // loopLimit not exeeded. ! while ((boolExpression) && ((loopLimit < 0) || (loopIndex < loopLimit))) { ! _whileBlock.write(out, context); ! // evaluate the condition against the current context. ! if (_macroCondition != null) ! boolExpression = Expression.isTrue(_macroCondition ! .evaluate(context)); ! ++loopIndex; ! } ! if (loopIndex >= loopLimit) { ! // exeeded the limit! ! String warning = "#" + _directiveName + ": exeeded the limit of " ! + loopLimit; ! writeWarning(warning, context, out); ! } ! } ! ! public void accept (TemplateVisitor v) ! { ! v.beginDirective(_desc.name); ! v.visitDirectiveArg("WhileCondition", _macroCondition); ! v.visitDirectiveArg("WhileBlock", _whileBlock); ! if (_limitExpr != null) ! v.visitDirectiveArg("WhileLimit", _limitExpr); ! v.endDirective(); ! } } \ No newline at end of file |
|
From: Tim P <ti...@us...> - 2008-03-18 19:37:35
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12403/src/org/webmacro/engine Modified Files: Expression.java Log Message: Organise imports Index: Expression.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/Expression.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Expression.java 31 Oct 2005 02:46:41 -0000 1.13 --- Expression.java 18 Mar 2008 19:37:25 -0000 1.14 *************** *** 23,30 **** package org.webmacro.engine; - import org.webmacro.*; - import java.io.IOException; /** * All WM expressions derive from this base class. --- 23,35 ---- package org.webmacro.engine; import java.io.IOException; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Macro; + import org.webmacro.PropertyException; + import org.webmacro.TemplateVisitor; + import org.webmacro.Visitable; + /** * All WM expressions derive from this base class. |
|
From: Tim P <ti...@us...> - 2008-03-18 19:33:38
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11337/src/org/webmacro/adapter/spring Modified Files: WebMacroView.java Log Message: Organise imports Index: WebMacroView.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring/WebMacroView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WebMacroView.java 28 Jan 2008 16:07:26 -0000 1.4 --- WebMacroView.java 18 Mar 2008 19:33:31 -0000 1.5 *************** *** 1,12 **** package org.webmacro.adapter.spring; ! import org.springframework.context.ApplicationContextException; ! import org.springframework.web.servlet.view.AbstractTemplateView; ! import org.webmacro.*; ! import org.webmacro.servlet.WebContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; ! import java.util.Map; /** --- 1,15 ---- package org.webmacro.adapter.spring; ! import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; ! ! import org.springframework.context.ApplicationContextException; ! import org.springframework.web.servlet.view.AbstractTemplateView; ! import org.webmacro.ResourceException; ! import org.webmacro.Template; ! import org.webmacro.WebMacro; ! import org.webmacro.servlet.WebContext; /** |
|
From: Tim P <ti...@us...> - 2008-03-18 16:18:52
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31316/src/org/webmacro Modified Files: WM.java Log Message: Organise imports, tidy Index: WM.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WM.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** WM.java 17 Mar 2006 18:45:22 -0000 1.46 --- WM.java 18 Mar 2008 16:18:47 -0000 1.47 *************** *** 24,29 **** package org.webmacro; ! import java.io.*; ! import java.util.*; import javax.servlet.Servlet; import javax.servlet.ServletContext; --- 24,31 ---- package org.webmacro; ! import java.io.OutputStream; ! import java.io.UnsupportedEncodingException; ! import java.util.Properties; ! import javax.servlet.Servlet; import javax.servlet.ServletContext; |
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29613/src/org/webmacro Modified Files: Broker.java Context.java ContextException.java FastWriter.java InitException.java InvalidContextException.java InvalidTypeException.java NotFoundException.java PropertyException.java ResourceException.java RethrowableException.java RethrowableRuntimeException.java Template.java TemplateException.java UnsettableException.java WebMacroException.java WebMacroRuntimeException.java Log Message: Organise imports, tidy Index: FastWriter.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/FastWriter.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** FastWriter.java 17 Mar 2006 23:44:09 -0000 1.32 --- FastWriter.java 18 Mar 2008 16:14:56 -0000 1.33 *************** *** 24,33 **** package org.webmacro; import org.webmacro.util.ByteBufferOutputStream; import org.webmacro.util.Encoder; import org.webmacro.util.EncoderProvider; - import java.io.*; - /** --- 24,37 ---- package org.webmacro; + import java.io.IOException; + import java.io.OutputStream; + import java.io.OutputStreamWriter; + import java.io.UnsupportedEncodingException; + import java.io.Writer; + import org.webmacro.util.ByteBufferOutputStream; import org.webmacro.util.Encoder; import org.webmacro.util.EncoderProvider; /** Index: TemplateException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/TemplateException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TemplateException.java 30 Jul 2005 04:00:21 -0000 1.7 --- TemplateException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 30,37 **** public class TemplateException extends WebMacroException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 30,33 ---- Index: RethrowableRuntimeException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/RethrowableRuntimeException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RethrowableRuntimeException.java 30 Jul 2005 04:00:21 -0000 1.5 --- RethrowableRuntimeException.java 18 Mar 2008 16:14:56 -0000 1.6 *************** *** 45,51 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 45,48 ---- Index: ResourceException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/ResourceException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ResourceException.java 30 Jul 2005 04:00:21 -0000 1.5 --- ResourceException.java 18 Mar 2008 16:14:56 -0000 1.6 *************** *** 31,37 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 31,34 ---- Index: Context.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Context.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Context.java 30 Jul 2003 04:51:17 -0000 1.64 --- Context.java 18 Mar 2008 16:14:56 -0000 1.65 *************** *** 24,28 **** package org.webmacro; ! import java.util.*; import org.webmacro.engine.EvaluationExceptionHandler; --- 24,31 ---- package org.webmacro; ! import java.util.Collection; ! import java.util.HashMap; ! import java.util.Map; ! import java.util.Set; import org.webmacro.engine.EvaluationExceptionHandler; Index: WebMacroRuntimeException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WebMacroRuntimeException.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WebMacroRuntimeException.java 30 Jul 2005 04:00:21 -0000 1.4 --- WebMacroRuntimeException.java 18 Mar 2008 16:14:56 -0000 1.5 *************** *** 30,36 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 30,33 ---- Index: InvalidContextException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/InvalidContextException.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** InvalidContextException.java 30 Jul 2005 04:00:21 -0000 1.9 --- InvalidContextException.java 18 Mar 2008 16:14:56 -0000 1.10 *************** *** 30,37 **** public class InvalidContextException extends PropertyException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 30,33 ---- Index: UnsettableException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/UnsettableException.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UnsettableException.java 30 Jul 2005 04:00:21 -0000 1.6 --- UnsettableException.java 18 Mar 2008 16:14:56 -0000 1.7 *************** *** 32,43 **** public class UnsettableException extends ContextException { - - /** - * - */ private static final long serialVersionUID = 1L; /** ! * Constructor only requires a reason * <p> * @param reason explains what went wrong --- 32,39 ---- public class UnsettableException extends ContextException { private static final long serialVersionUID = 1L; /** ! * Constructor only requires a reason. * <p> * @param reason explains what went wrong Index: RethrowableException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/RethrowableException.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RethrowableException.java 30 Jul 2005 04:00:21 -0000 1.8 --- RethrowableException.java 18 Mar 2008 16:14:56 -0000 1.9 *************** *** 45,52 **** public class RethrowableException extends Exception { - - /** - * - */ private static final long serialVersionUID = 1L; --- 45,48 ---- Index: Template.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Template.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Template.java 17 Mar 2006 18:53:23 -0000 1.19 --- Template.java 18 Mar 2008 16:14:56 -0000 1.20 *************** *** 24,28 **** package org.webmacro; ! import java.io.*; import java.util.Map; --- 24,29 ---- package org.webmacro; ! import java.io.IOException; ! import java.io.OutputStream; import java.util.Map; *************** *** 30,35 **** * Defines the type of object which contains * WebMacro script, text, blocks to be evaluated. * @author lane - * */ public interface Template extends Visitable --- 31,36 ---- * Defines the type of object which contains * WebMacro script, text, blocks to be evaluated. + * * @author lane */ public interface Template extends Visitable Index: InvalidTypeException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/InvalidTypeException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** InvalidTypeException.java 30 Jul 2005 04:00:21 -0000 1.5 --- InvalidTypeException.java 18 Mar 2008 16:14:56 -0000 1.6 *************** *** 31,37 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 31,34 ---- Index: NotFoundException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/NotFoundException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NotFoundException.java 30 Jul 2005 04:00:21 -0000 1.7 --- NotFoundException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 29,36 **** public class NotFoundException extends ResourceException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 29,32 ---- Index: InitException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/InitException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** InitException.java 30 Jul 2005 04:00:21 -0000 1.7 --- InitException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 31,37 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 31,34 ---- Index: Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Broker.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Broker.java 17 Mar 2006 18:41:41 -0000 1.47 --- Broker.java 18 Mar 2008 16:14:56 -0000 1.48 *************** *** 20,30 **** package org.webmacro; ! import java.io.*; import java.lang.ref.WeakReference; import java.net.MalformedURLException; import java.net.URL; ! import java.util.*; - import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; import org.webmacro.broker.ContextAutoLoader; import org.webmacro.engine.DefaultEvaluationExceptionHandler; --- 20,43 ---- package org.webmacro; ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileNotFoundException; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; ! import java.io.UnsupportedEncodingException; import java.lang.ref.WeakReference; import java.net.MalformedURLException; import java.net.URL; ! import java.util.Arrays; ! import java.util.Enumeration; ! import java.util.Hashtable; ! import java.util.Iterator; ! import java.util.Map; ! import java.util.Properties; ! import java.util.WeakHashMap; import org.webmacro.broker.ContextAutoLoader; import org.webmacro.engine.DefaultEvaluationExceptionHandler; *************** *** 40,43 **** --- 53,58 ---- import org.webmacro.util.SubSettings; + import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; + /** * The Broker is responsible for loading and initializing almost everything Index: WebMacroException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WebMacroException.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WebMacroException.java 30 Jul 2005 04:00:21 -0000 1.8 --- WebMacroException.java 18 Mar 2008 16:14:56 -0000 1.9 *************** *** 30,37 **** public class WebMacroException extends RethrowableException { - - /** - * - */ private static final long serialVersionUID = 1L; private String _contextLocation; --- 30,33 ---- Index: PropertyException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/PropertyException.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PropertyException.java 30 Jul 2005 04:00:21 -0000 1.18 --- PropertyException.java 18 Mar 2008 16:14:56 -0000 1.19 *************** *** 41,48 **** public class PropertyException extends ContextException { - /** - * - */ private static final long serialVersionUID = 1L; private String _message = null; --- 41,46 ---- public class PropertyException extends ContextException { private static final long serialVersionUID = 1L; + private String _message = null; Index: ContextException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/ContextException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ContextException.java 30 Jul 2005 04:00:21 -0000 1.7 --- ContextException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 32,38 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 32,35 ---- |
|
From: Tim P <ti...@us...> - 2008-03-18 12:50:21
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30803 Modified Files: pom.xml Log Message: Slightly better description. Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pom.xml 18 Mar 2008 12:34:32 -0000 1.8 --- pom.xml 18 Mar 2008 12:50:17 -0000 1.9 *************** *** 5,9 **** <name>WebMacro</name> <version>2.1-RC1-SNAPSHOT</version> ! <description>WebMacro template engine</description> <url>http://webmacro.sourceforge.net/</url> <issueManagement> --- 5,11 ---- <name>WebMacro</name> <version>2.1-RC1-SNAPSHOT</version> ! <description> ! WebMacro is a stable templating engine written in Java. ! </description> <url>http://webmacro.sourceforge.net/</url> <issueManagement> |
|
From: Tim P <ti...@us...> - 2008-03-18 12:34:40
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23733 Modified Files: pom.xml Log Message: Actually exclude them Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pom.xml 18 Mar 2008 12:32:14 -0000 1.7 --- pom.xml 18 Mar 2008 12:34:32 -0000 1.8 *************** *** 230,236 **** <exclude>**/*$*</exclude> <!-- works in eclipse, but not maven --> ! <!-- exclude>**/TestBackupCharStream.java</exclude --> <!-- works in eclipse, but not maven --> ! <!-- exclude>**/TestParseIncludeMacroDistribution.java</exclude --> </excludes> <includes> --- 230,236 ---- <exclude>**/*$*</exclude> <!-- works in eclipse, but not maven --> ! <exclude>**/TestBackupCharStream.java</exclude> <!-- works in eclipse, but not maven --> ! <exclude>**/TestParseIncludeMacroDistribution.java</exclude> </excludes> <includes> |
|
From: Tim P <ti...@us...> - 2008-03-18 12:32:17
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22724 Modified Files: pom.xml Log Message: Comment out those still not working on linux Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pom.xml 18 Mar 2008 12:27:27 -0000 1.6 --- pom.xml 18 Mar 2008 12:32:14 -0000 1.7 *************** *** 229,234 **** <!-- Maven HACK --> <exclude>**/*$*</exclude> ! <!-- Seem to be working now --> <!-- exclude>**/TestBackupCharStream.java</exclude --> <!-- exclude>**/TestParseIncludeMacroDistribution.java</exclude --> </excludes> --- 229,235 ---- <!-- Maven HACK --> <exclude>**/*$*</exclude> ! <!-- works in eclipse, but not maven --> <!-- exclude>**/TestBackupCharStream.java</exclude --> + <!-- works in eclipse, but not maven --> <!-- exclude>**/TestParseIncludeMacroDistribution.java</exclude --> </excludes> |
|
From: Tim P <ti...@us...> - 2008-03-18 12:27:33
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20445 Modified Files: pom.xml Log Message: scm connection Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pom.xml 18 Mar 2008 12:25:52 -0000 1.5 --- pom.xml 18 Mar 2008 12:27:27 -0000 1.6 *************** *** 157,162 **** </licenses> <scm> ! <connection>scm:cvs::pserver:ano...@we...:/cvsroot/webmacro</connection> ! <developerConnection>scm:cvs::ext:US...@we...:/cvsroot/webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> --- 157,162 ---- </licenses> <scm> ! <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro</connection> ! <developerConnection>scm:cvs:ext:US...@we...:/cvsroot/webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> |
|
From: Tim P <ti...@us...> - 2008-03-18 12:26:00
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19565 Modified Files: pom.xml Log Message: Exclude windows test, include some previously excluded, comment out changelog Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pom.xml 18 Mar 2008 00:10:26 -0000 1.4 --- pom.xml 18 Mar 2008 12:25:52 -0000 1.5 *************** *** 225,231 **** <!-- Ant filtered guck --> <exclude>**/TestVersion.java</exclude> ! <exclude>**/TestBackupCharStream.java</exclude> ! <exclude>**/TestParseIncludeMacroDistribution.java</exclude> <exclude>**/*$*</exclude> </excludes> <includes> --- 225,235 ---- <!-- Ant filtered guck --> <exclude>**/TestVersion.java</exclude> ! <!-- Works on windows but not linux/maven --> ! <exclude>**/TestWindows1251Encoding.java</exclude> ! <!-- Maven HACK --> <exclude>**/*$*</exclude> + <!-- Seem to be working now --> + <!-- exclude>**/TestBackupCharStream.java</exclude --> + <!-- exclude>**/TestParseIncludeMacroDistribution.java</exclude --> </excludes> <includes> *************** *** 343,350 **** <artifactId>cobertura-maven-plugin</artifactId> </plugin> ! <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changelog-plugin</artifactId> ! </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> --- 347,354 ---- <artifactId>cobertura-maven-plugin</artifactId> </plugin> ! <!-- plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changelog-plugin</artifactId> ! </plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> |
|
From: Tim P <ti...@us...> - 2008-03-18 12:10:04
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12526/src/org/webmacro/servlet Modified Files: TemplateTool.java Log Message: Use member rather than parameter to avoid warning Index: TemplateTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateTool.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TemplateTool.java 18 Mar 2008 10:48:19 -0000 1.10 --- TemplateTool.java 18 Mar 2008 12:09:57 -0000 1.11 *************** *** 52,56 **** { _context = c; ! return new MacroTemplateFactory(c); } --- 52,56 ---- { _context = c; ! return new MacroTemplateFactory(_context); } |
|
From: Tim P <ti...@us...> - 2008-03-18 12:07:07
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11201/src/org/webmacro/engine Modified Files: MacroBuilder.java Log Message: Comment out unused members Index: MacroBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/MacroBuilder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MacroBuilder.java 18 Mar 2008 10:45:27 -0000 1.7 --- MacroBuilder.java 18 Mar 2008 12:07:01 -0000 1.8 *************** *** 40,44 **** private String name; private ListBuilder argsBuilder; ! private int lineNo, colNo; //private String[] nullArgs = new String[0]; --- 40,44 ---- private String name; private ListBuilder argsBuilder; ! //private int lineNo, colNo; //private String[] nullArgs = new String[0]; *************** *** 49,54 **** this.name = name; this.argsBuilder = argsBuilder; ! this.lineNo = lineNo; ! this.colNo = colNo; } --- 49,54 ---- this.name = name; this.argsBuilder = argsBuilder; ! //this.lineNo = lineNo; ! //this.colNo = colNo; } |
6 messages has been excluded from this view by a project administrator.
