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-20 12:13:48
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19747/src/org/webmacro/engine Modified Files: MacroAdapter.java Log Message: Checkstyle: organise imports Index: MacroAdapter.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/MacroAdapter.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MacroAdapter.java 12 Jun 2003 00:47:45 -0000 1.11 --- MacroAdapter.java 20 Mar 2008 12:13:43 -0000 1.12 *************** *** 21,31 **** */ - package org.webmacro.engine; - import org.webmacro.*; - import java.io.IOException; /** * Looks like a Macro, but really it's not. Wrap any object as --- 21,34 ---- */ package org.webmacro.engine; import java.io.IOException; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Macro; + import org.webmacro.TemplateVisitor; + import org.webmacro.Visitable; + /** * Looks like a Macro, but really it's not. Wrap any object as |
|
From: Tim P <ti...@us...> - 2008-03-20 12:01:50
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15114/src/org/webmacro/util Modified Files: Base64.java Log Message: Checkstyle: utility classes should not have default or public constructors Index: Base64.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Base64.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Base64.java 31 Oct 2005 02:46:41 -0000 1.6 --- Base64.java 20 Mar 2008 12:01:46 -0000 1.7 *************** *** 38,44 **** private static final byte LOWER_SIX = (byte) (1 + 2 + 4 + 8 + 16 + 32); ! /** ! * Get the plain text version of a base64 encoded string */ --- 38,46 ---- private static final byte LOWER_SIX = (byte) (1 + 2 + 4 + 8 + 16 + 32); ! /* Disallow instantiation. */ ! private Base64() {} ! /** ! * Get the plain text version of a base64 encoded string. */ *************** *** 143,147 **** /** ! * Get the base64 encoded version of a plain text byte array */ final static public String encode (byte[] plain) --- 145,149 ---- /** ! * Get the base64 encoded version of a plain text byte array. */ final static public String encode (byte[] plain) *************** *** 264,268 **** /** ! * Turn a six-bit value into a base64 digit */ static private char base64 (byte sixBits) --- 266,270 ---- /** ! * Turn a six-bit value into a base64 digit. */ static private char base64 (byte sixBits) *************** *** 299,303 **** /** ! * Test harness */ public static void main (String arg[]) --- 301,305 ---- /** ! * Test harness. */ public static void main (String arg[]) |
|
From: Tim P <ti...@us...> - 2008-03-20 11:59:37
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14169/src/org/webmacro/resource Modified Files: BrokerTemplateProviderHelper.java Log Message: Checkstyle: organise imports Index: BrokerTemplateProviderHelper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateProviderHelper.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BrokerTemplateProviderHelper.java 17 Mar 2008 14:02:04 -0000 1.13 --- BrokerTemplateProviderHelper.java 20 Mar 2008 11:59:34 -0000 1.14 *************** *** 24,28 **** package org.webmacro.resource; ! import org.webmacro.*; import org.webmacro.engine.FileTemplate; import org.webmacro.engine.ParseException; --- 24,38 ---- package org.webmacro.resource; ! import java.io.File; ! import java.io.IOException; ! import java.net.URL; ! ! import org.webmacro.Broker; ! import org.webmacro.InitException; ! import org.webmacro.Log; ! import org.webmacro.NotFoundException; ! import org.webmacro.Provider; ! import org.webmacro.ResourceException; ! import org.webmacro.Template; import org.webmacro.engine.FileTemplate; import org.webmacro.engine.ParseException; *************** *** 30,37 **** import org.webmacro.util.Settings; - import java.io.File; - import java.io.IOException; - import java.net.URL; - /** * This class does the actual work of retrieving templates using the --- 40,43 ---- *************** *** 169,173 **** ! /** We don't implement this one */ public Object load (Object query, CacheElement ce) throws ResourceException --- 175,179 ---- ! /** We don't implement this one. */ public Object load (Object query, CacheElement ce) throws ResourceException |
|
From: Tim P <ti...@us...> - 2008-03-20 11:58:40
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13775/src/org/webmacro/tools Modified Files: CheckTemplates.java Log Message: Checkstyle: utility classes should not have default or public constructors Index: CheckTemplates.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/tools/CheckTemplates.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CheckTemplates.java 12 Jun 2003 00:47:48 -0000 1.7 --- CheckTemplates.java 20 Mar 2008 11:58:37 -0000 1.8 *************** *** 12,18 **** /** ! * CheckTemplates ! * ! * Program which uses the WebMacro parser to validate templates * * @author Brian Goetz --- 12,16 ---- /** ! * Program which uses the WebMacro parser to validate templates. * * @author Brian Goetz *************** *** 25,28 **** --- 23,28 ---- private static Broker broker; + private CheckTemplates() {} + public static void parseTemplate (String name, Reader in) { |
|
From: Tim P <ti...@us...> - 2008-03-20 11:56:29
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12986/src/org/webmacro/engine Modified Files: PropertyMethodBuilder.java Log Message: Checkstyle: javadoc Index: PropertyMethodBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/PropertyMethodBuilder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PropertyMethodBuilder.java 12 Jun 2003 00:47:45 -0000 1.5 --- PropertyMethodBuilder.java 20 Mar 2008 11:56:26 -0000 1.6 *************** *** 21,25 **** */ - package org.webmacro.engine; --- 21,24 ---- *************** *** 27,30 **** --- 26,33 ---- import org.webmacro.util.PropertyMethod; + /** + * @author justin + * @since 13/10/1999 + */ public class PropertyMethodBuilder implements Builder { |
|
From: Tim P <ti...@us...> - 2008-03-20 11:54:52
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12210/src/org/webmacro/directive Modified Files: IfDirective.java Log Message: Checkstyle: organise imports, javadoc Index: IfDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IfDirective.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** IfDirective.java 12 Jun 2003 00:47:44 -0000 1.16 --- IfDirective.java 20 Mar 2008 11:54:42 -0000 1.17 *************** *** 23,27 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.Block; import org.webmacro.engine.BuildContext; --- 23,33 ---- 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; *************** *** 29,40 **** import org.webmacro.engine.Expression; - import java.io.IOException; - /** - * Syntax: - * #if (condition) { block } - * [ #elseif (condition) { block } ] * - * [ #else { block } ] - * * IfDirective implements a WebMacro directive for an if..elseif..else * control structure. This directive is more complicated than most others --- 35,39 ---- *************** *** 43,46 **** --- 42,52 ---- * Therefore, the build() method is complicated, but the write() method * is fairly simple. + * + * Syntax: + * <pre> + * #if (condition) { block } + * [ #elseif (condition) { block } ] * + * [ #else { block } ] + * </pre> */ |
|
From: Tim P <ti...@us...> - 2008-03-20 11:52:13
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11396/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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TemplateTag.java 18 Mar 2008 20:46:01 -0000 1.5 --- TemplateTag.java 20 Mar 2008 11:52:10 -0000 1.6 *************** *** 69,88 **** /** ! * Name used for the JSP context attributes bean when in the WM context */ private static final String ATTRIBUTES_HELPER_NAME = "Attributes"; /** ! * Name used for an optional non-Map context object if supplied */ private static final String CONTEXT_VARIABLE_NAME = "Context"; /** ! * Our shared WebMacro instance */ private WebMacro webmacro; /** ! * Optional JSP-page supplied context variables to use */ private Object context; --- 69,88 ---- /** ! * Name used for the JSP context attributes bean when in the WM context. */ private static final String ATTRIBUTES_HELPER_NAME = "Attributes"; /** ! * Name used for an optional non-Map context object if supplied. */ private static final String CONTEXT_VARIABLE_NAME = "Context"; /** ! * Our shared WebMacro instance. */ private WebMacro webmacro; /** ! * Optional JSP-page supplied context variables to use. */ private Object context; *************** *** 109,113 **** /** ! * Set the src of an external template to use * @param src */ --- 109,113 ---- /** ! * Set the src of an external template to use. * @param src */ *************** *** 244,248 **** { ! templ = new StringTemplate( webmacro.getBroker(), bodyContent.getString(), "WebMacro script in JSP page "+servletName); --- 244,248 ---- { ! templ = new StringTemplate(webmacro.getBroker(), bodyContent.getString(), "WebMacro script in JSP page "+servletName); *************** *** 286,290 **** /** ! * Reset the tag */ public void release() --- 286,290 ---- /** ! * Reset the tag. */ public void release() |
|
From: Tim P <ti...@us...> - 2008-03-20 11:50:25
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10635/src/org/webmacro/directive Modified Files: EvalDirective.java Log Message: Checkstyle: organise imports Index: EvalDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/EvalDirective.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EvalDirective.java 17 Mar 2006 18:56:10 -0000 1.6 --- EvalDirective.java 20 Mar 2008 11:50:20 -0000 1.7 *************** *** 27,31 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; --- 27,34 ---- package org.webmacro.directive; ! import org.webmacro.Context; ! import org.webmacro.Macro; ! import org.webmacro.PropertyException; ! import org.webmacro.TemplateVisitor; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; *************** *** 71,75 **** } ! /** Creates a new instance of EvalDirective */ public EvalDirective() { --- 74,78 ---- } ! /** Creates a new instance of EvalDirective. */ public EvalDirective() { |
|
From: Tim P <ti...@us...> - 2008-03-20 11:49:27
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10215/src/org/webmacro/engine Modified Files: IntrospectionException.java Log Message: Checkstyle: Javadoc Index: IntrospectionException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/IntrospectionException.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** IntrospectionException.java 30 Jul 2005 04:00:34 -0000 1.6 --- IntrospectionException.java 20 Mar 2008 11:49:23 -0000 1.7 *************** *** 26,35 **** import org.webmacro.WebMacroException; public class IntrospectionException extends WebMacroException { - /** - * - */ private static final long serialVersionUID = 1L; --- 26,35 ---- import org.webmacro.WebMacroException; + /** + * Thrown when a Class cannot be found. + */ public class IntrospectionException extends WebMacroException { private static final long serialVersionUID = 1L; |
|
From: Tim P <ti...@us...> - 2008-03-20 11:47:56
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9442/src/org/webmacro/directive Modified Files: SetpropsDirective.java Log Message: Checkstyle: organise imports, javadoc Index: SetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetpropsDirective.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SetpropsDirective.java 1 Nov 2005 04:08:04 -0000 1.3 --- SetpropsDirective.java 20 Mar 2008 11:47:50 -0000 1.4 *************** *** 23,27 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; --- 23,34 ---- 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.WebMacroException; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; *************** *** 31,41 **** import org.webmacro.util.Instantiator; ! import java.io.IOException; ! ! /* * Set properties on an object using Java properties file * type syntax. - * @author Keats Kirsch * */ public class SetpropsDirective extends Directive --- 38,46 ---- import org.webmacro.util.Instantiator; ! /** * Set properties on an object using Java properties file * type syntax. * + * @author Keats Kirsch */ public class SetpropsDirective extends Directive *************** *** 102,106 **** { // target doesn't exist. Must create. ! // TODO check for class loading restrictions ala bean directive try { --- 107,111 ---- { // target doesn't exist. Must create. ! // TODO check for class loading restrictions as per bean directive try { *************** *** 150,154 **** private void setProp(Context context, String s, String prefix) ! throws PropertyException { String prop; --- 155,159 ---- private void setProp(Context context, String s, String prefix) ! throws PropertyException { String prop; |
|
From: Tim P <ti...@us...> - 2008-03-20 11:45:18
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8645/src/org/webmacro/resource Modified Files: UrlProvider.java Log Message: Checkstyle: organise imports Index: UrlProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/UrlProvider.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** UrlProvider.java 12 Jun 2003 00:47:47 -0000 1.14 --- UrlProvider.java 20 Mar 2008 11:45:15 -0000 1.15 *************** *** 24,27 **** --- 24,39 ---- package org.webmacro.resource; + import java.io.BufferedInputStream; + import java.io.File; + import java.io.FileInputStream; + import java.io.IOException; + import java.io.InputStream; + import java.io.InputStreamReader; + import java.io.Reader; + import java.io.StringWriter; + import java.net.MalformedURLException; + import java.net.URL; + import java.net.URLConnection; + import org.webmacro.Broker; import org.webmacro.InitException; *************** *** 29,37 **** import org.webmacro.util.Settings; - import java.io.*; - import java.net.MalformedURLException; - import java.net.URL; - import java.net.URLConnection; - /** * This is the canonical provider for mapping URLs to Handlers. The --- 41,44 ---- *************** *** 42,46 **** * handlers based on whatever criteria you wanted. */ - final public class UrlProvider extends CachingProvider { --- 49,52 ---- *************** *** 55,59 **** /** ! * We serve up "url" type resources */ final public String getType () --- 61,65 ---- /** ! * We serve up "url" type resources. */ final public String getType () |
|
From: Tim P <ti...@us...> - 2008-03-20 11:44:03
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7886/src/org/webmacro/util Modified Files: LogTargetFactory.java Log Message: Checkstyle: long line Index: LogTargetFactory.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogTargetFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LogTargetFactory.java 20 Mar 2008 10:24:06 -0000 1.6 --- LogTargetFactory.java 20 Mar 2008 11:44:00 -0000 1.7 *************** *** 32,36 **** * * If your LogTarget needs configuration settings from WebMacro, create a ! * constructor with this signature:<pre> * * public MyLogTarget (org.webmacro.util.Settings settings); --- 32,37 ---- * * If your LogTarget needs configuration settings from WebMacro, create a ! * constructor with this signature: ! * <pre> * * public MyLogTarget (org.webmacro.util.Settings settings); *************** *** 82,86 **** * new LogTarget during its construction */ ! public final LogTarget createLogTarget (Broker broker, String classname, Settings settings) throws LogCreationException { LogTarget lt = null; --- 83,89 ---- * new LogTarget during its construction */ ! public final LogTarget createLogTarget (Broker broker, String classname, ! Settings settings) ! throws LogCreationException { LogTarget lt = null; |
|
From: Tim P <ti...@us...> - 2008-03-20 11:42:56
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7501/src/org/webmacro/resource Modified Files: BrokerTemplateProvider.java Log Message: Checkstyle: unused import Index: BrokerTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateProvider.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BrokerTemplateProvider.java 20 Mar 2008 10:20:50 -0000 1.6 --- BrokerTemplateProvider.java 20 Mar 2008 11:42:51 -0000 1.7 *************** *** 26,30 **** import org.webmacro.InitException; import org.webmacro.Log; - import org.webmacro.Provider; import org.webmacro.ResourceException; import org.webmacro.util.Settings; --- 26,29 ---- *************** *** 37,41 **** * @author Brian Goetz * @since 0.96 ! * @see Provider * @see BrokerTemplateProviderHelper */ --- 36,40 ---- * @author Brian Goetz * @since 0.96 ! * @see org.webmacro.Provider * @see BrokerTemplateProviderHelper */ |
|
From: Tim P <ti...@us...> - 2008-03-20 11:41:25
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7106/src/org/webmacro/engine Modified Files: Block.java Log Message: Checkstyle: line length, javadoc Index: Block.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/Block.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Block.java 19 Mar 2008 23:51:11 -0000 1.25 --- Block.java 20 Mar 2008 11:41:18 -0000 1.26 *************** *** 79,83 **** * Interpret the directive and write it out, using the values in * the supplied context as appropriate. ! * <p> * @exception PropertyException if required data was missing from context * @exception IOException if we could not successfully write to out --- 79,83 ---- * Interpret the directive and write it out, using the values in * the supplied context as appropriate. ! * * @exception PropertyException if required data was missing from context * @exception IOException if we could not successfully write to out *************** *** 317,322 **** /** - * same as out but returns a String - * <p> * @exception PropertyException if required data was missing from context */ --- 317,320 ---- *************** *** 333,337 **** catch (IOException e) { ! context.getBroker().getLog("engine", "parsing and template execution").error("StringWriter threw an IOException!", e); return null; } --- 331,337 ---- catch (IOException e) { ! context.getBroker().getLog("engine", ! "parsing and template execution") ! .error("StringWriter threw an IOException!", e); return null; } |
|
From: Tim P <ti...@us...> - 2008-03-20 11:40:44
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6723/src/org/webmacro Modified Files: Macro.java Log Message: Javadoc, add FIXME Index: Macro.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Macro.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Macro.java 12 Jun 2003 00:47:44 -0000 1.8 --- Macro.java 20 Mar 2008 11:40:40 -0000 1.9 *************** *** 36,40 **** * Interpret the directive and write it out, using the values in * the supplied context as appropriate. ! * <p> * @exception PropertyException if required data was missing from context * @exception IOException if we could not successfully write to out --- 36,40 ---- * Interpret the directive and write it out, using the values in * the supplied context as appropriate. ! * * @exception PropertyException if required data was missing from context * @exception IOException if we could not successfully write to out *************** *** 44,49 **** /** ! * same as out but returns a String ! * <p> * @exception PropertyException if required data was missing from context */ --- 44,50 ---- /** ! * Same as write but return result as a String rather than writing it out. ! * FIXME Return a String not an Object ! * @return the result of interpretting as a String * @exception PropertyException if required data was missing from context */ |
|
From: Tim P <ti...@us...> - 2008-03-20 11:18:41
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30430/src/org/webmacro/engine Modified Files: Builder.java Log Message: Checkstyle: add javadoc Index: Builder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/Builder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Builder.java 12 Jun 2003 00:47:45 -0000 1.5 --- Builder.java 20 Mar 2008 11:18:37 -0000 1.6 *************** *** 25,28 **** --- 25,31 ---- + /** + * A Builder can build. + */ public interface Builder { |
|
From: Tim P <ti...@us...> - 2008-03-20 11:17:54
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30022/src/org/webmacro/directive Modified Files: DirectiveDescriptor.java Log Message: Javadoc Index: DirectiveDescriptor.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/DirectiveDescriptor.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DirectiveDescriptor.java 12 Jun 2003 00:47:44 -0000 1.11 --- DirectiveDescriptor.java 20 Mar 2008 11:17:49 -0000 1.12 *************** *** 47,53 **** * #elseif.) There are constructors for Subdirective in the Directive module * as well. * @author Brian Goetz */ - public final class DirectiveDescriptor { --- 47,53 ---- * #elseif.) There are constructors for Subdirective in the Directive module * as well. + * * @author Brian Goetz */ public final class DirectiveDescriptor { *************** *** 105,109 **** /** ! * Set the nextArg, children[] fields as necessary */ private static void completeArgs (ArgDescriptor[] args) --- 105,109 ---- /** ! * Set the nextArg, children[] fields as necessary. */ private static void completeArgs (ArgDescriptor[] args) |
|
From: Tim P <ti...@us...> - 2008-03-20 11:16:13
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28943/src/org/webmacro/engine Modified Files: DebugEvaluationExceptionHandler.java Log Message: Checkstyle: move javadoc to correct place Index: DebugEvaluationExceptionHandler.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/DebugEvaluationExceptionHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DebugEvaluationExceptionHandler.java 12 Jun 2003 00:47:45 -0000 1.8 --- DebugEvaluationExceptionHandler.java 20 Mar 2008 11:16:07 -0000 1.9 *************** *** 22,28 **** /** - * DebugEvaluationExceptionHandler - * * An implementation of EvaluationExceptionHandler which throws an exception * whenever it is called. The error is stored back into the webcontect and --- 22,36 ---- + package org.webmacro.engine; + + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.Log; + import org.webmacro.PropertyException; + import org.webmacro.util.Settings; + + import java.util.ArrayList; + /** * An implementation of EvaluationExceptionHandler which throws an exception * whenever it is called. The error is stored back into the webcontect and *************** *** 33,46 **** * * Example: ! * * #if ( $Variable.isDefined("WMERROR") ) * { ! * Error(s):<HR> ! * #foreach $item in $WMERROR ! * { ! * $item<BR> ! * } * } ! * * This will generally cause the exception to be * displayed to the user -- useful for debugging. --- 41,54 ---- * * Example: ! * <pre> * #if ( $Variable.isDefined("WMERROR") ) * { ! * Error(s):<HR> ! * #foreach $item in $WMERROR ! * { ! * $item<BR> ! * } * } ! * </pre> * This will generally cause the exception to be * displayed to the user -- useful for debugging. *************** *** 48,73 **** * @author Marcel Huijkman (Thanks to Brian Goetz & Keats Kirsch) * ! * @since 03-12-2001 ! * @version 17-07-2002 * */ - - /* - ChangeLog: - - 17-07-2002 - could not compile; - - */ - package org.webmacro.engine; - - import org.webmacro.Broker; - import org.webmacro.Context; - import org.webmacro.Log; - import org.webmacro.PropertyException; - import org.webmacro.util.Settings; - - import java.util.ArrayList; - public class DebugEvaluationExceptionHandler implements EvaluationExceptionHandler { --- 56,63 ---- * @author Marcel Huijkman (Thanks to Brian Goetz & Keats Kirsch) * ! * @since 03-12-2001 ! * @version 17-07-2002 * */ public class DebugEvaluationExceptionHandler implements EvaluationExceptionHandler { |
|
From: Tim P <ti...@us...> - 2008-03-20 11:14:14
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27409/src/org/webmacro/resource Modified Files: URLTemplateProvider.java Log Message: Checkstyle: organise imports, javadoc Index: URLTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplateProvider.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** URLTemplateProvider.java 18 Mar 2008 10:51:03 -0000 1.19 --- URLTemplateProvider.java 20 Mar 2008 11:14:07 -0000 1.20 *************** *** 23,29 **** package org.webmacro.resource; - import org.webmacro.*; - import org.webmacro.util.Settings; - import java.io.FileNotFoundException; import java.io.IOException; --- 23,26 ---- *************** *** 34,42 **** import java.util.StringTokenizer; /** * * * This is a "drop-in" replacement for the standard TemplateProvider in the ! * WebMacro distribution. The primary benefit is to allow template to be loaded * by a variety of means, without requiring an absolute path. This should make * applications more portable. --- 31,47 ---- import java.util.StringTokenizer; + import org.webmacro.Broker; + import org.webmacro.InitException; + import org.webmacro.Log; + import org.webmacro.NotFoundException; + import org.webmacro.ResourceException; + import org.webmacro.Template; + import org.webmacro.util.Settings; + /** * * * This is a "drop-in" replacement for the standard TemplateProvider in the ! * WebMacro distribution. The primary benefit is to allow a template to be loaded * by a variety of means, without requiring an absolute path. This should make * applications more portable. *************** *** 86,95 **** * @see org.webmacro.resource.CachingProvider * @see org.webmacro.resource.TemplateProvider */ final public class URLTemplateProvider extends CachingProvider { ! /** CVS Revision tag ! */ public static final String RCS = "@(#) $Id$"; --- 91,102 ---- * @see org.webmacro.resource.CachingProvider * @see org.webmacro.resource.TemplateProvider + * + * @since before 0.96 + * @author fergus */ final public class URLTemplateProvider extends CachingProvider { ! /** CVS Revision tag. */ public static final String RCS = "@(#) $Id$"; *************** *** 102,108 **** private static String _pathSeparator = ";"; - /** - * - */ private String[] _templateDirectory = null; --- 109,112 ---- *************** *** 179,183 **** /** * Create a new TemplateProvider that uses the specified directory ! * as the source for Template objects that it will return * * @param b A broker --- 183,187 ---- /** * Create a new TemplateProvider that uses the specified directory ! * as the source for Template objects that it will return. * * @param b A broker *************** *** 330,334 **** /** ! * load a template relative to the base. * @param path the relative or absolute URL-path of the template */ --- 334,338 ---- /** ! * Load a template relative to the base. * @param path the relative or absolute URL-path of the template */ *************** *** 408,412 **** /** ! * Get the URL for a specified template */ --- 412,416 ---- /** ! * Get the URL for a specified template. */ *************** *** 460,466 **** /** ! * The URL path separator. Used by join() */ - private static final String _SEP = "/"; --- 464,469 ---- /** ! * The URL path separator. Used by join(). */ private static final String _SEP = "/"; *************** *** 494,498 **** * */ - private final URL searchClasspath (String resource) { --- 497,500 ---- *************** *** 533,537 **** * e.g. "_en_GB" => "_en" */ - private final String stripLast (String s) { --- 535,538 ---- *************** *** 552,556 **** * e.g., "path/myfile","_en_GB",".wm" => "path/myfile{_en}.wm" */ - private final String buildPath (String pre, String mid, String post) { --- 553,556 ---- *************** *** 568,578 **** /** ! * parseLocalePath ! * Looks for a string of the form AAA{BBB}CCC * If found, returns [AAA,BBB,CCC], null otherwise * * This is used to strip out the "Locale" part of a resource name */ - private String[] parseLocalePath (String path) { --- 568,576 ---- /** ! * Looks for a string of the form AAA{BBB}CCC. * If found, returns [AAA,BBB,CCC], null otherwise * * This is used to strip out the "Locale" part of a resource name */ private String[] parseLocalePath (String path) { |
|
From: Tim P <ti...@us...> - 2008-03-20 11:08:07
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23641/src/org/webmacro Modified Files: WMConstants.java Log Message: Checkstyle: javadoc Index: WMConstants.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WMConstants.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WMConstants.java 12 Jun 2003 00:47:44 -0000 1.5 --- WMConstants.java 20 Mar 2008 11:08:02 -0000 1.6 *************** *** 25,28 **** --- 25,31 ---- + /** + * Constants used in WebMacro. + */ public final class WMConstants { *************** *** 33,48 **** /** ! * name of the local properties file. Only limited properties are ! * read from this (currently to do with file encodings) */ public static final String WEBMACRO_LOCAL_FILE = "WebMacro.local"; /** ! * name of the default properties file */ public static final String WEBMACRO_DEFAULTS_FILE = "WebMacro.defaults"; /** ! * name of the properties file */ public static final String WEBMACRO_PROPERTIES_FILE = "WebMacro.properties"; --- 36,51 ---- /** ! * Name of the local properties file. Only limited properties are ! * read from this (currently to do with file encodings). */ public static final String WEBMACRO_LOCAL_FILE = "WebMacro.local"; /** ! * Name of the default properties file. */ public static final String WEBMACRO_DEFAULTS_FILE = "WebMacro.defaults"; /** ! * Name of the properties file. */ public static final String WEBMACRO_PROPERTIES_FILE = "WebMacro.properties"; |
|
From: Tim P <ti...@us...> - 2008-03-20 11:06:01
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22234/src/org/webmacro/engine Modified Files: WMTemplate.java Log Message: Checkstyle does not like empty blocks - work around, organise imports Index: WMTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/WMTemplate.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** WMTemplate.java 21 Jul 2004 16:14:55 -0000 1.50 --- WMTemplate.java 20 Mar 2008 11:05:55 -0000 1.51 *************** *** 24,32 **** package org.webmacro.engine; ! import org.webmacro.*; ! ! import java.io.*; ! import java.util.Map; import java.util.Iterator; /** --- 24,42 ---- package org.webmacro.engine; ! import java.io.IOException; ! import java.io.OutputStream; ! import java.io.Reader; import java.util.Iterator; + import java.util.Map; + + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Log; + import org.webmacro.PropertyException; + import org.webmacro.Template; + import org.webmacro.TemplateException; + import org.webmacro.TemplateVisitor; + import org.webmacro.WMConstants; /** *************** *** 54,63 **** /** ! * The resource broker used to resolve things in this template */ final protected Broker _broker; /** ! * Where we log our errors */ final protected Log _log; --- 64,73 ---- /** ! * The resource broker used to resolve things in this template. */ final protected Broker _broker; /** ! * Where we log our errors. */ final protected Log _log; *************** *** 69,73 **** /** ! * What this template contains is a top level block */ protected Block _content; --- 79,83 ---- /** ! * What this template contains is a top level block. */ protected Block _content; *************** *** 75,89 **** /** * Which parser (grammar) is used to parse this template, ! * typically "wm" */ private String _parserName; /** ! * Template parameters */ private Map _parameters; /** ! * Template Macros */ private Map _macros; --- 85,99 ---- /** * Which parser (grammar) is used to parse this template, ! * typically "wm". */ private String _parserName; /** ! * Template parameters. */ private Map _parameters; /** ! * Template Macros. */ private Map _macros; *************** *** 124,128 **** /** ! * Return a name for this template. If not overridden, uses toString() */ public String getName () --- 134,138 ---- /** ! * Return a name for this template. If not overridden, uses toString(). */ public String getName () *************** *** 157,161 **** /** ! * Template API */ public void parse () throws IOException, TemplateException --- 167,171 ---- /** ! * Template API. */ public void parse () throws IOException, TemplateException *************** *** 214,219 **** in.close(); } ! catch (Exception e) { } _parameters = newParameters; --- 224,230 ---- in.close(); } ! catch (IOException e) { + e = null; // Real error reported above } _parameters = newParameters; *************** *** 353,357 **** /** * return the default encoding either from the WebMacro config ! * or the JVM settings * * Note for Unix users: you may need to set the environmental variable --- 364,368 ---- /** * return the default encoding either from the WebMacro config ! * or the JVM settings. * * Note for Unix users: you may need to set the environmental variable *************** *** 373,377 **** /** ! * Template API */ public Object getParam (String key) --- 384,388 ---- /** ! * Template API. */ public Object getParam (String key) |
|
From: Tim P <ti...@us...> - 2008-03-20 11:01:50
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16419/src/org/webmacro/util Modified Files: WMEval.java Log Message: Checkstyle: line length, javadoc Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/WMEval.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** WMEval.java 18 Mar 2008 11:20:35 -0000 1.21 --- WMEval.java 20 Mar 2008 11:01:41 -0000 1.22 *************** *** 143,155 **** * on multiple contexts. Init parses the currentTemplate supplied. * <p> ! * The argument to init() is the currentTemplate as a stream allowing the currentTemplate ! * to come from pretty much anywhere such as a url, a file, or a db field. * <p> ! * Care must be given to the fact that in parsing the currentTemplate, th current vm is able ! * to resolve locations of other currentTemplates referenced within the supplied currentTemplate. * <p> ! * Note, once this is complete, the parsed currentTemplate can be applied to successive ! * new object contexts. In other words, the application context * can assert new objects for currentTemplate application and remove others. * @param template The stream containing the top-level, unparsed currentTemplate. * --- 143,158 ---- * on multiple contexts. Init parses the currentTemplate supplied. * <p> ! * The argument to init() is the currentTemplate as a stream allowing the ! * currentTemplate to come from pretty much anywhere such as a url, ! * a file, or a db field. * <p> ! * Care must be given to the fact that in parsing the currentTemplate, ! * the current vm is able to resolve locations of other currentTemplates ! * referenced within the supplied currentTemplate. * <p> ! * Note, once this is complete, the parsed currentTemplate can be applied ! * to successive new object contexts. In other words, the application context * can assert new objects for currentTemplate application and remove others. + * * @param template The stream containing the top-level, unparsed currentTemplate. * *************** *** 158,162 **** { // ! Template t = new StreamTemplate(wm.getBroker(), new InputStreamReader(template)); t.parse(); this.currentTemplate = t; --- 161,166 ---- { // ! Template t = new StreamTemplate(wm.getBroker(), ! new InputStreamReader(template)); t.parse(); this.currentTemplate = t; *************** *** 260,271 **** /** ! * Evaluates the string template against the current context ! * and returns the value. If an output stream is specified, the value ! * is written out as well to this stream. * @param templateName The name of the template. * @param out An optional output stream. * @return The output from the evaluated template */ ! public String eval (Context context, String templateName, OutputStream out) throws Exception { return eval(context, templateName, out, null); --- 264,278 ---- /** ! * Evaluates the named template against the current context ! * and returns the value. ! * If an output stream is specified, the return value is ! * also written out to the stream. ! * * @param templateName The name of the template. * @param out An optional output stream. * @return The output from the evaluated template */ ! public String eval (Context context, String templateName, OutputStream out) ! throws Exception { return eval(context, templateName, out, null); *************** *** 371,377 **** /** ! * Evaluates the current context for the input file and writes it to the output file. */ ! public String eval (Context context, String templateName, String outputFileName, boolean append, String encoding) throws Exception { OutputStream out = new FileOutputStream(outputFileName, append); --- 378,395 ---- /** ! * Evaluate the named template against the given context. ! * Writes the output to the given output file. ! * ! * @param context the context to evaluate the template against ! * @param templateName the name of the template to evaluate ! * @param outputFileName name of file to output to ! * @param append whether to apppend output ! * @param encoding the encoding to use, may be null ! * @return ! * @throws Exception */ ! public String eval (Context context, String templateName, ! String outputFileName, boolean append, String encoding) ! throws Exception { OutputStream out = new FileOutputStream(outputFileName, append); |
|
From: Tim P <ti...@us...> - 2008-03-20 10:42:15
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7228/test/unit/org/webmacro/util Modified Files: TestHTMLEscaper.java Log Message: Remove tab Index: TestHTMLEscaper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/TestHTMLEscaper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestHTMLEscaper.java 5 Dec 2003 20:18:13 -0000 1.2 --- TestHTMLEscaper.java 20 Mar 2008 10:42:10 -0000 1.3 *************** *** 26,30 **** "This is a test: €€€ is better than" + "£££!" ); ! assertEscape("\u00F7","÷"); } --- 26,30 ---- "This is a test: €€€ is better than" + "£££!" ); ! assertEscape("\u00F7","÷"); } |
|
From: Tim P <ti...@us...> - 2008-03-20 10:26:49
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv470/src/org/webmacro/servlet Modified Files: Servlet22Broker.java Log Message: Checkstyle: organise imports Index: Servlet22Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/Servlet22Broker.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Servlet22Broker.java 19 Mar 2008 20:04:44 -0000 1.15 --- Servlet22Broker.java 20 Mar 2008 10:26:44 -0000 1.16 *************** *** 43,46 **** --- 43,47 ---- * context (WAR file), writes log messages to the servlet log, and loads * properties from the WAR file context parameters. + * * @author Brian Goetz * @author Marc Palmer (wj...@wa...) *************** *** 131,135 **** /** ! * Get a Servlet API 2.2 compatible broker for the ServletContext specified * @param sc The Servlet context * @param cl A ClassLoader to use, presumably the webapp classloader --- 132,137 ---- /** ! * Get a Servlet API 2.2 compatible broker for the ServletContext specified. ! * * @param sc The Servlet context * @param cl A ClassLoader to use, presumably the webapp classloader *************** *** 187,191 **** (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName ! + " joining Broker" + " " + b.getName() ); result = b; } --- 189,193 ---- (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName ! + " joining Broker" + " " + b.getName()); result = b; } |
|
From: Tim P <ti...@us...> - 2008-03-20 10:25:03
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32053/src/org/webmacro/directive Modified Files: ForeachDirective.java Log Message: Checkstyle: organise imports Index: ForeachDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/ForeachDirective.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ForeachDirective.java 1 Nov 2005 04:08:04 -0000 1.19 --- ForeachDirective.java 20 Mar 2008 10:24:57 -0000 1.20 *************** *** 23,31 **** package org.webmacro.directive; - import org.webmacro.*; - import org.webmacro.engine.*; - import java.io.IOException; import java.util.Iterator; /** * Implements iteration through a list or an array with --- 23,41 ---- package org.webmacro.directive; import java.io.IOException; import java.util.Iterator; + + 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; + import org.webmacro.engine.Variable; + /** * Implements iteration through a list or an array with |
6 messages has been excluded from this view by a project administrator.