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-19 16:06:24
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21381/src/org/webmacro/directive Modified Files: AlternateDirective.java Log Message: Checkstyle: organise imports Index: AlternateDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/AlternateDirective.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AlternateDirective.java 1 Nov 2005 04:08:04 -0000 1.13 --- AlternateDirective.java 19 Mar 2008 16:06:20 -0000 1.14 *************** *** 21,36 **** */ package org.webmacro.directive; - import org.webmacro.*; - import org.webmacro.engine.BuildContext; - import org.webmacro.engine.BuildException; - import org.webmacro.engine.Variable; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; /** * ! * Use the #alternate directive to create an "alternating" variable, which is ! * useful * for creating tables that use a different background color for each line, etc. * <p> --- 21,40 ---- */ package org.webmacro.directive; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Macro; + import org.webmacro.PropertyException; + import org.webmacro.TemplateVisitor; + import org.webmacro.engine.BuildContext; + import org.webmacro.engine.BuildException; + import org.webmacro.engine.Variable; /** * ! * Use the #alternate directive to create an "alternating" variable, * for creating tables that use a different background color for each line, etc. * <p> *************** *** 56,61 **** * <p> * - * - * * <i>expression</i> can be any "list" type understood by WebMacro: Object[], * --- 60,63 ---- *************** *** 77,89 **** * <p> * - * - * * The first time $color is evaluated, it will have the value "red". The next ! * time it ! * ! * is evaluated, it will have the value "blue", and so on through the list. When ! * it gets ! * ! * to the end of the list, it wraps back around to the beginning. * */ --- 79,85 ---- * <p> * * The first time $color is evaluated, it will have the value "red". The next ! * time it is evaluated, it will have the value "blue", and so on through the list. ! * When it gets to the end of the list, it wraps back around to the beginning. * */ *************** *** 189,191 **** return o; } ! } \ No newline at end of file --- 185,187 ---- return o; } ! } |
|
From: Tim P <ti...@us...> - 2008-03-19 15:47:08
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4369/src/org/webmacro/resource Modified Files: TrivialCacheManager.java Log Message: Checkstyle: put javadoc in correct place Index: TrivialCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/TrivialCacheManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrivialCacheManager.java 12 Jun 2003 00:47:47 -0000 1.4 --- TrivialCacheManager.java 19 Mar 2008 15:26:08 -0000 1.5 *************** *** 20,30 **** * See www.webmacro.org for more information on the WebMacro project. */ - - - /** - * A trivial implementation of CacheManager which does no caching at - * all. - * @since 0.96 - */ package org.webmacro.resource; --- 20,23 ---- *************** *** 34,38 **** import org.webmacro.util.Settings; ! public class TrivialCacheManager implements CacheManager { --- 27,35 ---- import org.webmacro.util.Settings; ! /** ! * A trivial implementation of CacheManager which does no caching at ! * all. ! * @since 0.96 ! */ public class TrivialCacheManager implements CacheManager { |
|
From: Tim P <ti...@us...> - 2008-03-19 15:20:33
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2074/src/org/webmacro/directive Modified Files: TempletDirective.java Log Message: Checkstyle: long line, import and explicit name Index: TempletDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/TempletDirective.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TempletDirective.java 18 Mar 2008 10:50:00 -0000 1.3 --- TempletDirective.java 19 Mar 2008 15:20:29 -0000 1.4 *************** *** 108,112 **** * @throws IOException N/A */ ! public void write(org.webmacro.FastWriter out, org.webmacro.Context context) throws org.webmacro.PropertyException, java.io.IOException { try --- 108,113 ---- * @throws IOException N/A */ ! public void write(org.webmacro.FastWriter out, org.webmacro.Context context) ! throws org.webmacro.PropertyException, IOException { try |
|
From: Tim P <ti...@us...> - 2008-03-19 15:15:30
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32573/src/org/webmacro/servlet Modified Files: ListUtil.java Log Message: Checkstyle: make final, simplify catch/return Index: ListUtil.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ListUtil.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ListUtil.java 18 Mar 2008 20:04:42 -0000 1.13 --- ListUtil.java 19 Mar 2008 15:15:27 -0000 1.14 *************** *** 42,50 **** * @see ListTool */ ! public class ListUtil { /** ! * Private constructor for a singleton class */ private ListUtil () --- 42,50 ---- * @see ListTool */ ! public final class ListUtil { /** ! * Private constructor for a singleton class. */ private ListUtil () *************** *** 63,68 **** /** - * - * @param o * @return true if the argument implements the java.util.List interface, false otherwise. */ --- 63,66 ---- *************** *** 74,78 **** /** - * @param o * @return true if the argument is an array, otherwise false. */ --- 72,75 ---- *************** *** 84,88 **** /** - * @param arg * @return false if the argument is a list or an array with at least one element, * true otherwise. --- 81,84 ---- *************** *** 178,184 **** /** * Allows access to elements in an array by position. Index is zero based. - * - * @param oa - * @param pos */ public static Object getItem (Object[] oa, int pos) --- 174,177 ---- *************** *** 193,199 **** /** * Allows access to elements in a List by position. Index is zero based. - * - * @param list - * @param pos */ public static Object getItem (List list, int pos) --- 186,189 ---- *************** *** 222,226 **** /** - * @param oa * @return number of elements in array argument */ --- 212,215 ---- *************** *** 231,235 **** /** - * @param list * @return number of elements in List argument */ --- 220,223 ---- *************** *** 248,253 **** /** - * @param list - * @param o * @return true if List argument contains the object argument, else false */ --- 236,239 ---- *************** *** 258,263 **** /** - * @param oa - * @param o * @return true if Array argument contains the object argument, else false */ --- 244,247 ---- *************** *** 268,273 **** /** - * @param arr - * @param o * @return true if array argument contains the object argument, else false */ --- 252,255 ---- *************** *** 699,703 **** } ! /** create a new ArrayList */ public static ArrayList create () { --- 681,685 ---- } ! /** Create a new ArrayList. */ public static ArrayList create () { *************** *** 705,709 **** } ! /** create a new ArrayList with the specified capacity */ public static ArrayList create (int capacity) { --- 687,691 ---- } ! /** Create a new ArrayList with the specified capacity. */ public static ArrayList create (int capacity) { *************** *** 711,715 **** } ! /** append one list to the end of another and return the expanded list. * If the first list is not expandable, return a new expandable list * with the elements of each list appended --- 693,698 ---- } ! /** ! * Append one list to the end of another and return the expanded list. * If the first list is not expandable, return a new expandable list * with the elements of each list appended *************** *** 726,739 **** catch (Exception e) { } - - // create a new list - List l = new ArrayList(((l1.size() + l2.size()) * 2) + 10); - l.addAll(l1); - l.addAll(l2); - return l; } ! /** create a new list (ArrayList) with all the elements in the supplied list */ public static List copy (Object o) { --- 709,721 ---- catch (Exception e) { + // create a new list + List l = new ArrayList(((l1.size() + l2.size()) * 2) + 10); + l.addAll(l1); + l.addAll(l2); + return l; } } ! /** Create a new list (ArrayList) with all the elements in the supplied list. */ public static List copy (Object o) { *************** *** 743,747 **** } ! /** test harness */ public static void main (String[] args) { --- 725,729 ---- } ! /** Test harness. */ public static void main (String[] args) { |
|
From: Tim P <ti...@us...> - 2008-03-19 12:54:53
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7303/src/org/webmacro/engine Modified Files: BuildException.java Log Message: Checkstyle: Javadoc Index: BuildException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/BuildException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BuildException.java 30 Jul 2005 04:00:34 -0000 1.7 --- BuildException.java 19 Mar 2008 12:54:47 -0000 1.8 *************** *** 26,35 **** import org.webmacro.TemplateException; public class BuildException extends TemplateException { - /** - * - */ private static final long serialVersionUID = 1L; --- 26,35 ---- import org.webmacro.TemplateException; + /** + * Thrown when a Directive or it's arguments fail to build. + */ public class BuildException extends TemplateException { private static final long serialVersionUID = 1L; |
|
From: Tim P <ti...@us...> - 2008-03-19 12:52:18
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6456/src/org/webmacro/directive Modified Files: IncludeDirective.java Log Message: Checkstyle: organise imports Index: IncludeDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** IncludeDirective.java 17 Mar 2006 18:56:10 -0000 1.25 --- IncludeDirective.java 19 Mar 2008 12:52:14 -0000 1.26 *************** *** 23,30 **** package org.webmacro.directive; - import org.webmacro.*; - import org.webmacro.engine.BuildContext; - import org.webmacro.engine.BuildException; - import java.io.IOException; import java.io.InputStream; --- 23,26 ---- *************** *** 33,40 **** import java.util.StringTokenizer; /** * IncludeDirective allows you to include other text files or Templates into ! * the current Template.<p> ! * * Syntax:<pre> * #include [as text|template|macro] quoted-string-variable --- 29,49 ---- import java.util.StringTokenizer; + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Log; + import org.webmacro.Macro; + import org.webmacro.NotFoundException; + import org.webmacro.PropertyException; + import org.webmacro.ResourceException; + import org.webmacro.Template; + import org.webmacro.TemplateVisitor; + import org.webmacro.engine.BuildContext; + import org.webmacro.engine.BuildException; + /** * IncludeDirective allows you to include other text files or Templates into ! * the current Template. ! * <p> * Syntax:<pre> * #include [as text|template|macro] quoted-string-variable *************** *** 167,177 **** { ! /** the file to include is a Template */ public static final int TYPE_TEMPLATE = 0; ! /** the file to include as a Template containing #macro's */ public static final int TYPE_MACRO = 1; ! /** the file to include is a static file. */ public static final int TYPE_TEXT = 2; ! /** the file to include is unknown */ public static final int TYPE_DYNAMIC = 3; --- 176,186 ---- { ! /** The file to include is a Template. */ public static final int TYPE_TEMPLATE = 0; ! /** The file to include as a Template containing #macro's. */ public static final int TYPE_MACRO = 1; ! /** The file to include is a static file. */ public static final int TYPE_TEXT = 2; ! /** The file to include is unknown. */ public static final int TYPE_DYNAMIC = 3; *************** *** 206,210 **** // ! /** place holder for the TemplateExtensions configuration key name */ private String TEMPLATE_EXTENSIONS_NAME = ".TemplateExtensions"; --- 215,219 ---- // ! /** Place holder for the TemplateExtensions configuration key name. */ private String TEMPLATE_EXTENSIONS_NAME = ".TemplateExtensions"; *************** *** 212,226 **** /** Logging can be good */ protected Log _log; ! /** the included file type. one of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC */ protected int _type; ! /** the filename as a Macro, if the filename arg is a Macro */ protected Macro _macFilename; /** ! * the filename as a String, if it is something we can determine during ! * build() */ protected String _strFilename; /** ! * the name given to the directive by webmacro configuration. Used in * conjuction with the <code>StrictCompatibility</code> configuration * and to make determinitaions on how the #included file should be included. --- 221,236 ---- /** Logging can be good */ protected Log _log; ! /** The included file type. ! * One of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC. */ protected int _type; ! /** The filename as a Macro, if the filename arg is a Macro. */ protected Macro _macFilename; /** ! * The filename as a String, if it is something we can determine during ! * build(). */ protected String _strFilename; /** ! * The name given to the directive by webmacro configuration. Used in * conjuction with the <code>StrictCompatibility</code> configuration * and to make determinitaions on how the #included file should be included. *************** *** 241,245 **** * of this directive. */ ! public final Object build (DirectiveBuilder builder, BuildContext bc) throws BuildException { Broker broker = bc.getBroker(); --- 251,256 ---- * of this directive. */ ! public final Object build (DirectiveBuilder builder, BuildContext bc) ! throws BuildException { Broker broker = bc.getBroker(); *************** *** 345,349 **** * <code>context</code> parameter before being written to the FastWriter */ ! public void write (FastWriter out, Context context) throws PropertyException, IOException { Broker broker = context.getBroker(); --- 356,361 ---- * <code>context</code> parameter before being written to the FastWriter */ ! public void write (FastWriter out, Context context) ! throws PropertyException, IOException { Broker broker = context.getBroker(); *************** *** 407,412 **** /** ! * get an array of Template file extensions we should use, if type==dynamic, ! * to decide if the specified file is a template or not */ protected String[] getTemplateExtensions (Broker b) --- 419,424 ---- /** ! * Get an array of Template file extensions we should use, if type==dynamic, ! * to decide if the specified file is a template or not. */ protected String[] getTemplateExtensions (Broker b) *************** *** 433,437 **** /** ! * if the filename contains <i>://</i> assume it's a file b/c it's probably * a url.<p> * --- 445,449 ---- /** ! * If the filename contains <i>://</i> assume it's a file b/c it's probably * a url.<p> * *************** *** 461,466 **** /** ! * get the template or file that the user wants to include, based on the ! * specified type. This method does not know how to get a file whose type * is "TYPE_DYNAMIC". */ --- 473,478 ---- /** ! * Get the template or file that the user wants to include, based on the ! * specified type. This method does not know how to get a file whose type. * is "TYPE_DYNAMIC". */ *************** *** 493,497 **** /** ! * get a Template via the "template" provider known by the specified broker */ protected Template getTemplate (Broker b, String name) throws PropertyException --- 505,509 ---- /** ! * Get a Template via the "template" provider known by the specified broker. */ protected Template getTemplate (Broker b, String name) throws PropertyException *************** *** 516,520 **** /** ! * get the contents of a file (local file or url) via the "url" provider * known by the specified broker. If the url provider can't find it * we check the Broker (Broker.getResource). --- 528,532 ---- /** ! * Get the contents of a file (local file or url) via the "url" provider * known by the specified broker. If the url provider can't find it * we check the Broker (Broker.getResource). *************** *** 606,608 **** return new PropertyException(message); } ! } \ No newline at end of file --- 618,621 ---- return new PropertyException(message); } ! } ! |
|
From: Tim P <ti...@us...> - 2008-03-19 12:48:20
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4937/src/org/webmacro/adapter/spring Modified Files: WebMacroViewResolver.java Log Message: Checkstyle: whitespace Index: WebMacroViewResolver.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring/WebMacroViewResolver.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WebMacroViewResolver.java 14 Mar 2008 00:20:41 -0000 1.5 --- WebMacroViewResolver.java 19 Mar 2008 12:48:16 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- /** * User: mpalmer + * @since 08 Dec 2005 */ public class WebMacroViewResolver extends AbstractTemplateViewResolver *************** *** 51,55 **** } ! view.setWebMacro( webMacro); view.checkTemplate(); --- 52,56 ---- } ! view.setWebMacro(webMacro); view.checkTemplate(); |
|
From: Tim P <ti...@us...> - 2008-03-19 12:45:48
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3800/src/org/webmacro/util Modified Files: LogTarget.java Log Message: Checkstyle: missing line end at end of file Index: LogTarget.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogTarget.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LogTarget.java 12 Jun 2003 00:47:48 -0000 1.8 --- LogTarget.java 19 Mar 2008 12:45:44 -0000 1.9 *************** *** 75,77 **** public void removeObserver (LogSystem ls); ! } \ No newline at end of file --- 75,78 ---- public void removeObserver (LogSystem ls); ! } ! |
|
From: Tim P <ti...@us...> - 2008-03-19 12:40:58
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1824/src/org/webmacro/servlet Modified Files: TemplateServlet.java Log Message: Checkstyle: field hiding Index: TemplateServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateServlet.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TemplateServlet.java 18 Mar 2008 21:28:42 -0000 1.10 --- TemplateServlet.java 19 Mar 2008 12:40:55 -0000 1.11 *************** *** 64,67 **** --- 64,70 ---- * magic in a super-class. * </p> + * + * @since 24 Jan 2004 + * @author lanesharman */ public class TemplateServlet extends HttpServlet { *************** *** 107,111 **** * The delegate to populate the context for the application. */ ! private ServletRouter sr; protected Log log; --- 110,114 ---- * The delegate to populate the context for the application. */ ! private ServletRouter servletRouter; protected Log log; *************** *** 138,142 **** String sr = settings.getSetting("TemplateServlet.ServletRouter"); if (sr != null) { ! this.sr = (ServletRouter) Class.forName(sr).newInstance(); } refreshGlobalContext(); --- 141,145 ---- String sr = settings.getSetting("TemplateServlet.ServletRouter"); if (sr != null) { ! this.servletRouter = (ServletRouter) Class.forName(sr).newInstance(); } refreshGlobalContext(); *************** *** 254,262 **** HttpServletRequest request, HttpServletResponse resp) throws ServletException { ! if (this.sr != null) { try { ! sr.handleWebRequest(this, context, template); } catch (Exception e) { ! this.log("Unable to process router " + sr.getClass().getName(), e); throw new ServletException(e.toString()); --- 257,265 ---- HttpServletRequest request, HttpServletResponse resp) throws ServletException { ! if (this.servletRouter != null) { try { ! servletRouter.handleWebRequest(this, context, template); } catch (Exception e) { ! this.log("Unable to process router " + servletRouter.getClass().getName(), e); throw new ServletException(e.toString()); |
|
From: Tim P <ti...@us...> - 2008-03-19 12:36:08
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32263/src/org/webmacro/directive Modified Files: SetDirective.java Log Message: Checkstyle: organise imports Index: SetDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetDirective.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SetDirective.java 1 Nov 2005 04:08:04 -0000 1.16 --- SetDirective.java 19 Mar 2008 12:36:00 -0000 1.17 *************** *** 23,32 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; import org.webmacro.engine.Variable; - import java.io.IOException; /** * Implements the setting of a variable. --- 23,37 ---- 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.BuildContext; import org.webmacro.engine.BuildException; import org.webmacro.engine.Variable; /** * Implements the setting of a variable. |
|
From: Tim P <ti...@us...> - 2008-03-19 12:35:10
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31815/src/org/webmacro/engine Modified Files: IntrospectionUtils.java Log Message: Checkstyle: make final Index: IntrospectionUtils.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/IntrospectionUtils.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IntrospectionUtils.java 12 Jun 2003 00:47:45 -0000 1.3 --- IntrospectionUtils.java 19 Mar 2008 12:35:00 -0000 1.4 *************** *** 27,39 **** * @since May 25, 2002 */ ! public class IntrospectionUtils { ! /** Creates a new instance of IntrospectionUtils */ private IntrospectionUtils () { } ! final static boolean matches (Class[] sig, Class[] args) { if (args.length != sig.length) --- 27,39 ---- * @since May 25, 2002 */ ! public final class IntrospectionUtils { ! /** Deny instantiation */ private IntrospectionUtils () { } ! static boolean matches (Class[] sig, Class[] args) { if (args.length != sig.length) *************** *** 69,78 **** catch (NullPointerException e) { ! return false; // XXX: block nulls, isAssign... throws this } return true; } ! final static public Class[] createTypesFromArgs (Object[] args) { Class[] types = new Class[args.length]; --- 69,78 ---- catch (NullPointerException e) { ! return false; // XXX: block nulls, isAssignableFrom throws this } return true; } ! static public Class[] createTypesFromArgs (Object[] args) { Class[] types = new Class[args.length]; *************** *** 91,95 **** } ! /** attempt to instantiate a class with the supplied args */ static public Object instantiate (Class c, Object[] args) throws Exception --- 91,95 ---- } ! /** Attempt to instantiate a class with the supplied args. */ static public Object instantiate (Class c, Object[] args) throws Exception *************** *** 103,107 **** { // try each constructor with the right number of args, ! // untill one works or all have failed java.lang.reflect.Constructor[] cons = c.getConstructors(); for (int i = 0; i < cons.length; i++) --- 103,107 ---- { // try each constructor with the right number of args, ! // until one works or all have failed java.lang.reflect.Constructor[] cons = c.getConstructors(); for (int i = 0; i < cons.length; i++) *************** *** 117,121 **** catch (Exception e) { ! } } --- 117,121 ---- catch (Exception e) { ! // ignore this failure, try the next one } } |
|
From: Tim P <ti...@us...> - 2008-03-19 12:29:06
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28775/src/org/webmacro/servlet Modified Files: WMServlet.java Log Message: Checkstyle: line length Index: WMServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** WMServlet.java 18 Mar 2008 21:23:53 -0000 1.64 --- WMServlet.java 19 Mar 2008 12:28:53 -0000 1.65 *************** *** 53,58 **** /** * This is an abstract base class which can be used ! * to implement a kind of WebMacro servlet. You ! * can either subclass from it directly, or make use of one of the * generic subclasses provided. * <p> --- 53,59 ---- /** * This is an abstract base class which can be used ! * to implement a kind of WebMacro servlet. ! * ! * You can either subclass from it directly, or make use of one of the * generic subclasses provided. * <p> *************** *** 72,76 **** /** * The name of the config entry we look for to find out what to ! * call the variable used in the ERROR_TEMPLATE */ final static String ERROR_VARIABLE = "ErrorVariable"; --- 73,77 ---- /** * The name of the config entry we look for to find out what to ! * call the variable used in the ERROR_TEMPLATE. */ final static String ERROR_VARIABLE = "ErrorVariable"; *************** *** 78,87 **** /** * The name of the error template we will use if something ! * goes wrong */ final static String ERROR_TEMPLATE = "ErrorTemplate"; /** ! * Defaults for error variable and error template */ final static String ERROR_TEMPLATE_DEFAULT = "error.wm"; --- 79,88 ---- /** * The name of the error template we will use if something ! * goes wrong. */ final static String ERROR_TEMPLATE = "ErrorTemplate"; /** ! * Defaults for error variable and error template. */ final static String ERROR_TEMPLATE_DEFAULT = "error.wm"; *************** *** 89,104 **** /** ! * Log object used to write out messages */ protected Log _log; /** ! * null means all OK */ ! private String _problem = "Not yet initialized: Your servlet API tried to access WebMacro without first calling init()!!!"; /** * This is the old-style init method, it just calls init(), after ! * handing the ServletConfig object to the superclass * @exception ServletException if it failed to initialize */ --- 90,106 ---- /** ! * Log object used to write out messages. */ protected Log _log; /** ! * Null means all OK. */ ! private String _problem = "Not yet initialized: " + ! "Your servlet API tried to access WebMacro without first calling init()!!!"; /** * This is the old-style init method, it just calls init(), after ! * handing the ServletConfig object to the superclass. * @exception ServletException if it failed to initialize */ *************** *** 327,331 **** /** ! * <p>Returns the name of the error variable, as per the config.</p> * @return Name to use for the error variable in templates */ --- 329,333 ---- /** ! * Returns the name of the error variable, as per the config. * @return Name to use for the error variable in templates */ *************** *** 428,432 **** /** ! * Create a new Context object */ public Context getContext () --- 430,434 ---- /** ! * Create a new Context object. */ public Context getContext () *************** *** 436,440 **** /** ! * Create a new WebContext object; can be overridden */ public WebContext getWebContext (HttpServletRequest req, HttpServletResponse res) --- 438,442 ---- /** ! * Create a new WebContext object; can be overridden. */ public WebContext getWebContext (HttpServletRequest req, HttpServletResponse res) *************** *** 808,810 **** ! } \ No newline at end of file --- 810,813 ---- ! } ! |
|
From: Tim P <ti...@us...> - 2008-03-19 09:54:29
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9953/src/org/webmacro/util Modified Files: Settings.java Log Message: Checkstyle: javadoc, try to stop it complaining about uncommented empty catch Index: Settings.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Settings.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Settings.java 31 Oct 2005 02:46:41 -0000 1.17 --- Settings.java 19 Mar 2008 09:54:24 -0000 1.18 *************** *** 40,43 **** --- 40,46 ---- { + /** + * Handler for a setting whose value may be a list. + */ abstract public static class ListSettingHandler { *************** *** 120,123 **** --- 123,127 ---- catch (MalformedURLException e) { + // Yes, ignore this exception } ; |
|
From: Tim P <ti...@us...> - 2008-03-19 09:45:07
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6074/src/org/webmacro/engine Modified Files: BuildContext.java Log Message: Checkstyle: organise imports Index: BuildContext.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/BuildContext.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** BuildContext.java 21 Jul 2003 21:25:40 -0000 1.28 --- BuildContext.java 19 Mar 2008 09:44:58 -0000 1.29 *************** *** 24,32 **** package org.webmacro.engine; - import org.webmacro.*; - import java.util.HashMap; import java.util.Map; /** --- 24,37 ---- package org.webmacro.engine; import java.util.HashMap; import java.util.Map; + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.Macro; + import org.webmacro.NotFoundException; + import org.webmacro.ResourceException; + import org.webmacro.Template; + /** *************** *** 99,103 **** /** ! * Add a MacroDefinition to the build context */ public void putMacro (String name, MacroDefinition macro) --- 104,108 ---- /** ! * Add a MacroDefinition to the build context. */ public void putMacro (String name, MacroDefinition macro) *************** *** 107,111 **** /** ! * Search for a MacroDefinition in the build context */ public MacroDefinition getMacro (String name) --- 112,116 ---- /** ! * Search for a MacroDefinition in the build context. */ public MacroDefinition getMacro (String name) *************** *** 116,120 **** /** * Add #macros and #params from the specified Template to ! * this bulid context */ public void mergeConstants (Template t) --- 121,125 ---- /** * Add #macros and #params from the specified Template to ! * this bulid context. */ public void mergeConstants (Template t) *************** *** 129,133 **** /** ! * Return the map of MacroDefinitions */ public Map getMacros () --- 134,138 ---- /** ! * Return the map of MacroDefinitions. */ public Map getMacros () *************** *** 137,142 **** /** ! * Create a variable (or resolve a constant at build time) ! * Used by various build() routines */ Object resolveVariableReference (Object names[]) --- 142,147 ---- /** ! * Create a variable (or resolve a constant at build time). ! * Used by various build() routines. */ Object resolveVariableReference (Object names[]) |
|
From: Tim P <ti...@us...> - 2008-03-19 09:43:35
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5672/src/org/webmacro/engine Modified Files: ParserProvider.java Log Message: Checkstyle: organise imports Index: ParserProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/ParserProvider.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ParserProvider.java 12 Jun 2003 00:47:45 -0000 1.11 --- ParserProvider.java 19 Mar 2008 09:43:27 -0000 1.12 *************** *** 24,34 **** package org.webmacro.engine; - import org.webmacro.*; - import org.webmacro.util.Settings; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Hashtable; /** * Utility class to assist in the creation of directives. --- 24,38 ---- package org.webmacro.engine; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Hashtable; + import org.webmacro.Broker; + import org.webmacro.InitException; + import org.webmacro.Log; + import org.webmacro.NotFoundException; + import org.webmacro.Provider; + import org.webmacro.util.Settings; + /** * Utility class to assist in the creation of directives. *************** *** 47,51 **** /** ! * Register a new parser class, * @exception IntrospectionException something wrong with the class * @exception InitException duplicate registration --- 51,55 ---- /** ! * Register a new parser class. * @exception IntrospectionException something wrong with the class * @exception InitException duplicate registration |
|
From: Tim P <ti...@us...> - 2008-03-19 09:41:50
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4907/src/org/webmacro/engine Modified Files: StreamTemplate.java Log Message: Checkstyle: line length, organise imports Index: StreamTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/StreamTemplate.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** StreamTemplate.java 8 Jul 2003 19:48:44 -0000 1.31 --- StreamTemplate.java 19 Mar 2008 09:41:44 -0000 1.32 *************** *** 24,30 **** package org.webmacro.engine; - import org.webmacro.*; - import org.webmacro.util.SelectList; - import java.io.IOException; import java.io.InputStream; --- 24,27 ---- *************** *** 33,36 **** --- 30,41 ---- import java.util.Date; + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.Template; + import org.webmacro.WM; + import org.webmacro.WMConstants; + import org.webmacro.WebMacro; + import org.webmacro.util.SelectList; + /** * StreamTempaltes are constructed with a stream from which they *************** *** 45,49 **** /** ! * Our stream */ private Reader _in; --- 50,54 ---- /** ! * Our stream. */ private Reader _in; *************** *** 134,138 **** /** ! * Simple test */ public static void main (String arg[]) --- 139,143 ---- /** ! * Simple test. */ public static void main (String arg[]) *************** *** 186,190 **** System.out.println("- - - - - - - - - - - - - - - - - - - -"); ! System.out.println("Context contains: helloWorld, hello, file, TestObject[] fruits, SelectList sl(fruits, 3), TestObject flipper"); System.out.println("- - - - - - - - - - - - - - - - - - - -"); --- 191,197 ---- System.out.println("- - - - - - - - - - - - - - - - - - - -"); ! System.out.println("Context contains: helloWorld, " + ! "hello, file, TestObject[] fruits, " + ! "SelectList sl(fruits, 3), TestObject flipper"); System.out.println("- - - - - - - - - - - - - - - - - - - -"); |
|
From: Tim P <ti...@us...> - 2008-03-19 09:38:08
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3479/src/org/webmacro/directive Modified Files: Directive.java Log Message: Checkstyle: line length Index: Directive.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/Directive.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Directive.java 1 Nov 2005 04:08:04 -0000 1.23 --- Directive.java 19 Mar 2008 09:38:05 -0000 1.24 *************** *** 23,32 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; - import java.io.IOException; - /** * Directive is an abstract class which directives can extend. --- 23,37 ---- 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.Visitable; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; /** * Directive is an abstract class which directives can extend. *************** *** 44,47 **** --- 49,53 ---- * statically, using the various XxxArg() constructors, and return a reference * to that from getDescriptor(). + * * @author Brian Goetz */ *************** *** 110,114 **** { return context.getEvaluationExceptionHandler() ! .warningString("WARNING: " + warning + " at " + context.getCurrentLocation()); } --- 116,121 ---- { return context.getEvaluationExceptionHandler() ! .warningString("WARNING: " + warning + ! " at " + context.getCurrentLocation()); } *************** *** 120,126 **** * This method also outputs the same warning message to a log named "directive" */ ! protected static void writeWarning (String warning, Context context, FastWriter writer) throws IOException, PropertyException { ! context.getLog("directive").warning(warning + " at " + context.getCurrentLocation()); writer.write(getWarningText(warning, context)); } --- 127,135 ---- * This method also outputs the same warning message to a log named "directive" */ ! protected static void writeWarning (String warning, Context context, ! FastWriter writer) throws IOException, PropertyException { ! context.getLog("directive").warning(warning + ! " at " + context.getCurrentLocation()); writer.write(getWarningText(warning, context)); } *************** *** 491,498 **** public static class NotSimpleVariableBuildException extends BuildException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 500,503 ---- |
|
From: Tim P <ti...@us...> - 2008-03-19 09:35:26
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2465/src/org/webmacro/engine Modified Files: QuotedStringBuilder.java Log Message: Checkstyle: javadoc attribution Index: QuotedStringBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/QuotedStringBuilder.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** QuotedStringBuilder.java 17 Mar 2008 12:13:53 -0000 1.17 --- QuotedStringBuilder.java 19 Mar 2008 09:35:22 -0000 1.18 *************** *** 36,39 **** --- 36,44 ---- + /** + * @author justin + * @since 19 Oct 1999 + * + */ public final class QuotedStringBuilder extends Vector implements Builder { |
|
From: Tim P <ti...@us...> - 2008-03-19 09:28:33
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32068/src/org/webmacro/util Modified Files: EncodingCache.java Log Message: Checkstyle: line length Index: EncodingCache.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/EncodingCache.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** EncodingCache.java 18 Mar 2008 11:05:04 -0000 1.15 --- EncodingCache.java 19 Mar 2008 09:28:25 -0000 1.16 *************** *** 106,113 **** encoding.equalsIgnoreCase("UTF16")) { ! throw new UnsupportedEncodingException("The encoding you specified is invalid: " + encoding + ". Note that the UNICODE and UTF16 encodings are not supported by WebMacro because they prefix the stream with a market indicating whether the stream is big endian or little endian. Instead choose the byte ordering yourself by using the UTF-16BE or UTF-16LE encodings."); } _encoding = encoding; ! "some test string".getBytes(encoding); // throw exception is encoding is invalid } --- 106,122 ---- encoding.equalsIgnoreCase("UTF16")) { ! throw new UnsupportedEncodingException( ! "The encoding you specified is invalid: " + ! encoding + ". " + ! "Note that the UNICODE and UTF16 encodings are not " + ! "supported by WebMacro because " + ! "they prefix the stream with a marker indicating " + ! "whether the stream is big endian or little endian. " + ! "Instead choose the byte ordering yourself by using " + ! "the UTF-16BE or UTF-16LE encodings."); } _encoding = encoding; ! // throw exception if encoding is invalid ! "some test string".getBytes(encoding); } *************** *** 218,222 **** catch (UnsupportedEncodingException e) { ! e.printStackTrace(); // never happen: we check in ctor return null; } --- 227,231 ---- catch (UnsupportedEncodingException e) { ! e.printStackTrace(); // will never happen: we check in constructor return null; } *************** *** 242,251 **** public static void main (String arg[]) { - try { ! /** byte[] prefix = getPrefix(arg[0]); ! System.out.println("Prefix for " + arg[0] + " is " + prefix.length + " bytes long"); */ EncodingCache ec = new EncodingCache("UTF-16LE", 11); --- 251,260 ---- public static void main (String arg[]) { try { ! /* byte[] prefix = getPrefix(arg[0]); ! System.out.println("Prefix for " + arg[0] + " is " + ! prefix.length + " bytes long"); */ EncodingCache ec = new EncodingCache("UTF-16LE", 11); |
|
From: Tim P <ti...@us...> - 2008-03-19 09:25:16
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30520/src/org/webmacro/util Modified Files: EncoderProvider.java Log Message: Checkstyle: organise imports Index: EncoderProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/EncoderProvider.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EncoderProvider.java 12 Jun 2003 00:47:48 -0000 1.4 --- EncoderProvider.java 19 Mar 2008 09:25:03 -0000 1.5 *************** *** 23,32 **** package org.webmacro.util; - import org.webmacro.*; - import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; /** * A provider which dispenses Encoders, which are used for encoding --- 23,36 ---- package org.webmacro.util; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; + import org.webmacro.Broker; + import org.webmacro.InitException; + import org.webmacro.NotFoundException; + import org.webmacro.Provider; + import org.webmacro.ResourceException; + /** * A provider which dispenses Encoders, which are used for encoding |
|
From: Tim P <ti...@us...> - 2008-03-19 00:20:35
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3526/src/org/webmacro Modified Files: WM.java Log Message: Typo in javadoc Index: WM.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WM.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** WM.java 18 Mar 2008 16:18:47 -0000 1.47 --- WM.java 19 Mar 2008 00:20:29 -0000 1.48 *************** *** 93,98 **** /** ! * Constructs a WM is tied to a Servlet broker. Depending on the ! * servlet containers level of servlet support, property fetching, * logging, and template fetching will be managed by the servlet broker. */ --- 93,98 ---- /** ! * Constructs a WM tied to a Servlet broker. Depending on the ! * servlet container's level of servlet support, property fetching, * logging, and template fetching will be managed by the servlet broker. */ |
|
From: Tim P <ti...@us...> - 2008-03-18 23:48:21
|
Update of /cvsroot/webmacro/webmacro/examples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23558/examples Modified Files: index.html Log Message: Broken link, add title Index: index.html =================================================================== RCS file: /cvsroot/webmacro/webmacro/examples/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.html 24 Oct 2005 00:21:01 -0000 1.4 --- index.html 18 Mar 2008 23:48:18 -0000 1.5 *************** *** 1,3 **** --- 1,4 ---- <html> + <title>WebMacro Examples</title> <body> <H1>WebMacro Examples</H1> *************** *** 9,13 **** <li><a href="servlet/SandBox">Sand Box</a> </ol> ! <H1><a href="advanced/index.tml">Advanced Examples (advanced/)</a></H1> </body> </html> --- 10,14 ---- <li><a href="servlet/SandBox">Sand Box</a> </ol> ! <H1><a href="advanced/index.html">Advanced Examples</a></H1> </body> </html> |
|
From: Tim P <ti...@us...> - 2008-03-18 23:06:09
|
Update of /cvsroot/webmacro/webmacro/examples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6910/examples Modified Files: NoServlet.java Log Message: Checkstyle: Organise imports Index: NoServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/examples/NoServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NoServlet.java 8 Jul 2003 19:48:44 -0000 1.3 --- NoServlet.java 18 Mar 2008 23:06:05 -0000 1.4 *************** *** 19,25 **** - import org.webmacro.*; import java.util.Date; /** * This example demonstrates using WebMacro outside the context of a servlet. --- 19,28 ---- import java.util.Date; + import org.webmacro.Context; + import org.webmacro.Template; + import org.webmacro.WM; + /** * This example demonstrates using WebMacro outside the context of a servlet. |
|
From: Tim P <ti...@us...> - 2008-03-18 22:47:39
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30449 Modified Files: pom.xml Log Message: Add example source into unit test classpath Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pom.xml 18 Mar 2008 12:50:17 -0000 1.9 --- pom.xml 18 Mar 2008 22:47:35 -0000 1.10 *************** *** 215,245 **** </testResources> <plugins> ! <plugin> ! <groupId>org.apache.maven.plugins</groupId> ! <artifactId>maven-surefire-plugin</artifactId> ! <configuration> ! <redirectTestOutputToFile>true</redirectTestOutputToFile> ! <!-- forkMode>once</forkMode --> ! <!-- threadCount>1</threadCount--> ! <childDelegation>false</childDelegation> ! <useFile>true</useFile> ! <excludes> ! <!-- Ant filtered guck --> ! <exclude>**/TestVersion.java</exclude> ! <!-- Works on windows but not linux/maven --> ! <exclude>**/TestWindows1251Encoding.java</exclude> ! <!-- 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> ! <includes> ! <include>**/Test*.java</include> ! </includes> ! </configuration> ! </plugin> ! <plugin> <artifactId>maven-javadoc-plugin</artifactId> --- 215,260 ---- </testResources> <plugins> ! <plugin> ! <groupId>org.codehaus.mojo</groupId> ! <artifactId>build-helper-maven-plugin</artifactId> ! <configuration> ! <sources> ! <source>examples</source> ! </sources> ! </configuration> ! <executions> ! <execution> ! <goals> ! <goal>add-test-source</goal> ! </goals> ! </execution> ! </executions> ! </plugin> ! <plugin> ! <groupId>org.apache.maven.plugins</groupId> ! <artifactId>maven-surefire-plugin</artifactId> ! <configuration> ! <redirectTestOutputToFile>true</redirectTestOutputToFile> ! <!-- forkMode>once</forkMode --> ! <!-- threadCount>1</threadCount--> ! <childDelegation>false</childDelegation> ! <useFile>true</useFile> ! <excludes> ! <!-- Ant filtered guck --> ! <exclude>**/TestVersion.java</exclude> ! <!-- Works on windows but not linux/maven --> ! <exclude>**/TestWindows1251Encoding.java</exclude> ! <!-- 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> ! <includes> ! <include>**/Test*.java</include> ! </includes> ! </configuration> ! </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> *************** *** 298,313 **** </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mockobjects</groupId> - <artifactId>mockobjects-core</artifactId> - <version>0.09</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> --- 313,316 ---- *************** *** 316,320 **** </dependency> <dependency> ! <groupId>springframework</groupId> <artifactId>spring</artifactId> <version>1.2.6</version> --- 319,323 ---- </dependency> <dependency> ! <groupId>org.springframework</groupId> <artifactId>spring</artifactId> <version>1.2.6</version> *************** *** 322,330 **** </dependency> <dependency> ! <groupId>springframework</groupId> <artifactId>spring-mock</artifactId> <version>1.2.6</version> <scope>compile</scope> </dependency> </dependencies> <reporting> --- 325,371 ---- </dependency> <dependency> ! <groupId>org.springframework</groupId> <artifactId>spring-mock</artifactId> <version>1.2.6</version> <scope>compile</scope> </dependency> + + + <dependency> + <groupId>net.sourceforge.jwebunit</groupId> + <artifactId>jwebunit-core</artifactId> + <version>1.4.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.jwebunit</groupId> + <artifactId>jwebunit-htmlunit-plugin</artifactId> + <version>1.4.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + <version>6.1.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>mockobjects</groupId> + <artifactId>mockobjects-core</artifactId> + <version>0.09</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> </dependencies> <reporting> |
|
From: Tim P <ti...@us...> - 2008-03-18 22:36:41
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25945/test/unit/org/webmacro/template Modified Files: TemplateTestCase.java Log Message: Eclipse: impossible condition Index: TemplateTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** TemplateTestCase.java 1 Apr 2005 05:28:57 -0000 1.21 --- TemplateTestCase.java 18 Mar 2008 22:36:36 -0000 1.22 *************** *** 133,137 **** assertTrue(_context.get("assertEvaluationEquals") == null); else ! assertTrue(result == null ? "null" : result.toString(), result.equals(_context.get("assertEvaluationEquals"))); } --- 133,137 ---- assertTrue(_context.get("assertEvaluationEquals") == null); else ! assertTrue(result.toString(), result.equals(_context.get("assertEvaluationEquals"))); } |
6 messages has been excluded from this view by a project administrator.
