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-11-13 00:02:34
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23879/test/unit/org/webmacro/template Modified Files: TestArithmetic.java Log Message: Unnecessary cast Index: TestArithmetic.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestArithmetic.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestArithmetic.java 12 Jun 2003 00:47:49 -0000 1.4 --- TestArithmetic.java 13 Nov 2008 00:02:26 -0000 1.5 *************** *** 26,30 **** for (int i = 0; i < N; i++) { ! c.put(integers[i], new Integer((int) values[i])); c.put(longs[i], new Long(values[i])); c.put(shorts[i], new Short((short) values[i])); --- 26,30 ---- for (int i = 0; i < N; i++) { ! c.put(integers[i], new Integer(values[i])); c.put(longs[i], new Long(values[i])); c.put(shorts[i], new Short((short) values[i])); |
From: Tim P <ti...@us...> - 2008-11-13 00:01:48
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23718/src/org/webmacro/engine Modified Files: MethodWrapper.java Log Message: Unnecessary cast Index: MethodWrapper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/MethodWrapper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MethodWrapper.java 12 Jun 2003 00:47:45 -0000 1.4 --- MethodWrapper.java 13 Nov 2008 00:01:41 -0000 1.5 *************** *** 72,76 **** for (int i = 0; i < _methods.length; i++) { ! Method m = (Method) _methods[i]; Class[] sig = m.getParameterTypes(); if (IntrospectionUtils.matches(sig, types)) --- 72,76 ---- for (int i = 0; i < _methods.length; i++) { ! Method m = _methods[i]; Class[] sig = m.getParameterTypes(); if (IntrospectionUtils.matches(sig, types)) |
From: Tim P <ti...@us...> - 2008-11-12 23:41:38
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21814/test/unit/org/webmacro/template Modified Files: TemplateTestCase.java TestSetpropsDirective.java Log Message: Cannot rely upon name constructor being called, use our init method, thats what it is for. Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestSetpropsDirective.java 17 Oct 2005 04:30:26 -0000 1.1 --- TestSetpropsDirective.java 12 Nov 2008 23:41:31 -0000 1.2 *************** *** 8,24 **** { ! public TestSetpropsDirective(String name) { ! super(name); ! System.getProperties().setProperty("org.webmacro.ImpliedPackages", ! "java.util"); ! System.getProperties().setProperty("org.webmacro.AllowedPackages", ! "java.util"); } ! public void stuffContext(Context context) throws Exception { ! context ! .setEvaluationExceptionHandler(new CrankyEvaluationExceptionHandler()); context.put("User", new User()); } --- 8,36 ---- { ! public TestSetpropsDirective() ! { ! super(); ! } ! public TestSetpropsDirective(String name) ! { ! super(name); ! } ! ! protected void setUp () throws Exception { ! super.setUp(); } ! public void init () throws Exception ! { ! System.getProperties().setProperty("org.webmacro.ImpliedPackages", ! "java.util"); ! System.getProperties().setProperty("org.webmacro.AllowedPackages", ! "java.util"); ! super.init(); ! } ! public void stuffContext(Context context) throws Exception { ! context.setEvaluationExceptionHandler(new CrankyEvaluationExceptionHandler()); context.put("User", new User()); } Index: TemplateTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** TemplateTestCase.java 4 Nov 2008 20:59:05 -0000 1.23 --- TemplateTestCase.java 12 Nov 2008 23:41:31 -0000 1.24 *************** *** 19,22 **** --- 19,26 ---- + public TemplateTestCase () + { + super(); + } public TemplateTestCase (String name) { |
From: Tim P <ti...@us...> - 2008-11-12 23:30:26
|
Update of /cvsroot/webmacro/webmacro/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20689 Removed Files: servlet-2.2.jar Log Message: move up --- servlet-2.2.jar DELETED --- |
From: Tim P <ti...@us...> - 2008-11-12 23:28:41
|
Update of /cvsroot/webmacro/webmacro/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20530 Added Files: commons-logging-1.1.jar Removed Files: commons-logging.jar Log Message: Version jars --- commons-logging.jar DELETED --- --- NEW FILE: commons-logging-1.1.jar --- (This appears to be a binary file; contents omitted.) |
From: Tim P <ti...@us...> - 2008-11-12 23:24:27
|
Update of /cvsroot/webmacro/webmacro/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20209/lib Added Files: jakarta-regexp-1.4.jar Removed Files: apache-regexp.jar Log Message: Version jars --- apache-regexp.jar DELETED --- --- NEW FILE: jakarta-regexp-1.4.jar --- (This appears to be a binary file; contents omitted.) |
From: Tim P <ti...@us...> - 2008-11-12 23:24:09
|
Update of /cvsroot/webmacro/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20186 Modified Files: build.xml Log Message: concurrent mentioned twice Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/build.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** build.xml 12 Nov 2008 21:22:27 -0000 1.53 --- build.xml 12 Nov 2008 23:24:03 -0000 1.54 *************** *** 226,230 **** </copy> <copy todir="${dist.source}" file="${jar}"/> ! <copy todir="${dist.source}" file="lib/concurrent.jar" /> <copy file='WebMacro.defaults.minimal' todir='${dist.source}' /> <copy file='WebMacro.defaults.classic' todir='${dist.source}' /> --- 226,230 ---- </copy> <copy todir="${dist.source}" file="${jar}"/> ! <copy todir="${dist.source}" file="lib/concurrent-1.3.4.jar" /> <copy file='WebMacro.defaults.minimal' todir='${dist.source}' /> <copy file='WebMacro.defaults.classic' todir='${dist.source}' /> |
From: Tim P <ti...@us...> - 2008-11-12 23:23:40
|
Update of /cvsroot/webmacro/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20132 Modified Files: pom.xml Log Message: regexp only used in tests Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pom.xml 12 Nov 2008 21:22:27 -0000 1.15 --- pom.xml 12 Nov 2008 23:23:29 -0000 1.16 *************** *** 328,337 **** </dependency> <dependency> - <groupId>jakarta-regexp</groupId> - <artifactId>jakarta-regexp</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> --- 328,331 ---- *************** *** 354,357 **** --- 348,357 ---- <dependency> + <groupId>jakarta-regexp</groupId> + <artifactId>jakarta-regexp</artifactId> + <version>1.4</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-core</artifactId> |
From: Tim P <ti...@us...> - 2008-11-12 21:22:38
|
Update of /cvsroot/webmacro/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30384 Modified Files: build.xml pom.xml Log Message: Move up to servlet 2.3, version concurrent jar Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pom.xml 5 Nov 2008 23:05:39 -0000 1.14 --- pom.xml 12 Nov 2008 21:22:27 -0000 1.15 *************** *** 241,256 **** <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> <!-- works in eclipse, but not maven --> ! <exclude>**/TestSetpropsDirective.java</exclude> </excludes> <includes> --- 241,254 ---- <useFile>true</useFile> <excludes> <!-- 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 --> <!-- works in eclipse, but not maven --> ! <!-- exclude>**/TestSetpropsDirective.java</exclude --> </excludes> <includes> *************** *** 338,342 **** <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> ! <version>2.2</version> <scope>compile</scope> </dependency> --- 336,340 ---- <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> ! <version>2.3</version> <scope>compile</scope> </dependency> Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/build.xml,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** build.xml 5 Nov 2008 23:24:52 -0000 1.52 --- build.xml 12 Nov 2008 21:22:27 -0000 1.53 *************** *** 194,199 **** <copy todir="${dist.binary}" file="${jar}"/> <copy todir="${dist.binary}" file="${adapters-jar}"/> ! <copy todir="${dist.binary}" file="lib/concurrent.jar" /> ! <copy todir="${dist.binary}" file="lib/servlet-2.2.jar" /> <copy todir="${dist.binary}"> <fileset dir="distroot" /> --- 194,199 ---- <copy todir="${dist.binary}" file="${jar}"/> <copy todir="${dist.binary}" file="${adapters-jar}"/> ! <copy todir="${dist.binary}" file="lib/concurrent-1.3.4.jar" /> ! <copy todir="${dist.binary}" file="lib/servlet-api-2.3.jar" /> <copy todir="${dist.binary}"> <fileset dir="distroot" /> |
From: Tim P <ti...@us...> - 2008-11-12 21:22:37
|
Update of /cvsroot/webmacro/webmacro/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30384/lib Added Files: concurrent-1.3.4.jar Removed Files: concurrent.jar Log Message: Move up to servlet 2.3, version concurrent jar --- concurrent.jar DELETED --- --- NEW FILE: concurrent-1.3.4.jar --- (This appears to be a binary file; contents omitted.) |
From: Tim P <ti...@us...> - 2008-11-12 21:20:09
|
Update of /cvsroot/webmacro/webmacro/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30213 Added Files: servlet-api-2.3.jar Log Message: Move up to 2.3 --- NEW FILE: servlet-api-2.3.jar --- (This appears to be a binary file; contents omitted.) |
From: Tim P <ti...@us...> - 2008-11-12 20:56:47
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27223/test/unit/org/webmacro Removed Files: TestVersion.java Log Message: Play nice with Maven --- TestVersion.java DELETED --- |
From: Tim P <ti...@us...> - 2008-11-12 20:55:51
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27116/src/org/webmacro Modified Files: WebMacro.java Log Message: Play nice with Maven Index: WebMacro.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WebMacro.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** WebMacro.java 17 Mar 2006 18:43:59 -0000 1.18 --- WebMacro.java 12 Nov 2008 20:55:47 -0000 1.19 *************** *** 43,51 **** /** ! * The current version of WebMacro. The actual value is ! * inserted by ANT during the "compile" process */ ! public static final String VERSION = "@VERSION@"; ! public static final String BUILD_DATE = "@BUILD_DATE@"; /** --- 43,51 ---- /** ! * The current version of WebMacro. ! * No longer using ant filtering. */ ! public static final String VERSION = "2.1"; ! public static final String BUILD_DATE = "2008-11-13"; /** |
From: Tim P <ti...@us...> - 2008-11-12 20:30:11
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23785/src/org/webmacro/servlet Modified Files: URLTool.java Log Message: Remove use of HttpUtil, deprecated in servlet 2.3 api Index: URLTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/URLTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** URLTool.java 20 Mar 2008 12:40:18 -0000 1.7 --- URLTool.java 12 Nov 2008 20:30:08 -0000 1.8 *************** *** 29,33 **** import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpUtils; /** --- 29,32 ---- *************** *** 59,63 **** public String getRequestURL () { ! return HttpUtils.getRequestURL(context.getRequest()).toString(); } --- 58,62 ---- public String getRequestURL () { ! return context.getRequest().getRequestURL().toString(); } *************** *** 73,77 **** { HttpServletRequest req = context.getRequest(); ! StringBuffer b = HttpUtils.getRequestURL(req); String query = req.getQueryString(); if (query != null) --- 72,76 ---- { HttpServletRequest req = context.getRequest(); ! StringBuffer b = req.getRequestURL(); String query = req.getQueryString(); if (query != null) |
From: Tim P <ti...@us...> - 2008-11-12 20:26:56
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23590/src/org/webmacro/servlet Modified Files: TemplateTool.java Log Message: Field hiding Index: TemplateTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateTool.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TemplateTool.java 18 Mar 2008 12:09:57 -0000 1.11 --- TemplateTool.java 12 Nov 2008 20:26:52 -0000 1.12 *************** *** 60,64 **** { ! private Context _context; private ArrayList _macros = new ArrayList(10); --- 60,64 ---- { ! private Context _contextLocal; private ArrayList _macros = new ArrayList(10); *************** *** 68,72 **** public MacroTemplateFactory (Context ctx) { ! _context = ctx; } --- 68,72 ---- public MacroTemplateFactory (Context ctx) { ! _contextLocal = ctx; } *************** *** 77,81 **** public MacroTemplate fromString (String s) { ! MacroTemplate mt = new MacroTemplate(_context, s); _macros.add(mt); return mt; --- 77,81 ---- public MacroTemplate fromString (String s) { ! MacroTemplate mt = new MacroTemplate(_contextLocal, s); _macros.add(mt); return mt; *************** *** 91,97 **** throws org.webmacro.ResourceException { ! Template t = (Template) _context.getBroker() .getProvider("template").get(fileRef); ! MacroTemplate mt = new MacroTemplate(_context, t); _macros.add(mt); return mt; --- 91,97 ---- throws org.webmacro.ResourceException { ! Template t = (Template) _contextLocal.getBroker() .getProvider("template").get(fileRef); ! MacroTemplate mt = new MacroTemplate(_contextLocal, t); _macros.add(mt); return mt; *************** *** 108,112 **** private Template _template; ! private Context _context, _origContext; /** --- 108,112 ---- private Template _template; ! private Context _contextLocal, _origContext; /** *************** *** 120,124 **** _origContext = c; // @@@ Just get a new one? ! _context = c.cloneContext(); } --- 120,124 ---- _origContext = c; // @@@ Just get a new one? ! _contextLocal = c.cloneContext(); } *************** *** 141,145 **** public Context getArgs () { ! return _context; } --- 141,145 ---- public Context getArgs () { ! return _contextLocal; } *************** *** 152,158 **** public Object eval () throws PropertyException { ! synchronized (_context) { ! return _template.evaluateAsString(_context); } } --- 152,158 ---- public Object eval () throws PropertyException { ! synchronized (_contextLocal) { ! return _template.evaluateAsString(_contextLocal); } } *************** *** 164,170 **** for (int i = 0; i < args.length; i++) { ! _context.put("arg" + (i + 1), args[i]); } ! _context.put("args", args); } return eval(); --- 164,170 ---- for (int i = 0; i < args.length; i++) { ! _contextLocal.put("arg" + (i + 1), args[i]); } ! _contextLocal.put("args", args); } return eval(); *************** *** 178,184 **** for (int i = 0; i < args.length; i++) { ! _context.put(names[i], args[i]); } ! _context.put("args", args); return eval(); } --- 178,184 ---- for (int i = 0; i < args.length; i++) { ! _contextLocal.put(names[i], args[i]); } ! _contextLocal.put("args", args); return eval(); } *************** *** 186,190 **** public Object eval (java.util.Map map) throws PropertyException { ! _context.putAll(map); return eval(); } --- 186,190 ---- public Object eval (java.util.Map map) throws PropertyException { ! _contextLocal.putAll(map); return eval(); } *************** *** 196,202 **** public void copyCurrentContext () { ! synchronized (_context) { ! _context.putAll(_origContext); } } --- 196,202 ---- public void copyCurrentContext () { ! synchronized (_contextLocal) { ! _contextLocal.putAll(_origContext); } } |
From: Tim P <ti...@us...> - 2008-11-12 20:23:37
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23336/test/unit/org/webmacro/template Modified Files: TestSyntheticTemplate.java Log Message: Field hiding Index: TestSyntheticTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSyntheticTemplate.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TestSyntheticTemplate.java 18 Mar 2008 10:08:17 -0000 1.10 --- TestSyntheticTemplate.java 12 Nov 2008 20:23:32 -0000 1.11 *************** *** 270,274 **** duration = System.currentTimeMillis() - duration; for (int index = 0; index < threadCount; index++) ! tet += threadTest[index].tet; } --- 270,274 ---- duration = System.currentTimeMillis() - duration; for (int index = 0; index < threadCount; index++) ! tet += threadTest[index].tet1; } *************** *** 276,285 **** class ThreadTest extends Thread { ! long tet = 0; public void run () { ! this.tet = System.currentTimeMillis(); for (int index = 0; index < iterationCount; index++) { --- 276,285 ---- class ThreadTest extends Thread { ! long tet1 = 0; public void run () { ! this.tet1 = System.currentTimeMillis(); for (int index = 0; index < iterationCount; index++) { *************** *** 299,303 **** if (it > worstCase) worstCase = it; } ! this.tet = System.currentTimeMillis() - tet; } } --- 299,303 ---- if (it > worstCase) worstCase = it; } ! this.tet1 = System.currentTimeMillis() - tet1; } } |
From: Tim P <ti...@us...> - 2008-11-05 23:31:15
|
Update of /cvsroot/webmacro/webmacro/test In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30780/test Modified Files: build.xml Log Message: Clean up after WMTest Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/build.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** build.xml 5 Nov 2008 23:25:23 -0000 1.17 --- build.xml 5 Nov 2008 23:31:09 -0000 1.18 *************** *** 43,46 **** --- 43,49 ---- <delete file='PerformanceReport.html'/> <delete file='ecomm.html'/> + <!-- see WMEvalTest --> + <delete file='t.tmp'/> + <delete file='T'/> </target> |
From: Tim P <ti...@us...> - 2008-11-05 23:25:27
|
Update of /cvsroot/webmacro/webmacro/test In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29566 Modified Files: build.xml Log Message: Ensure clean cleans up Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** build.xml 4 Nov 2008 22:11:28 -0000 1.16 --- build.xml 5 Nov 2008 23:25:23 -0000 1.17 *************** *** 37,40 **** --- 37,43 ---- <delete file='LoadReport.html'/> <delete file='controls.html'/> + <delete file='winFrame.html'/> + <delete file='windows.html'/> + <delete file='verisign.html'/> <delete file='LoadReportRelease2Features.html'/> <delete file='PerformanceReport.html'/> |
From: Tim P <ti...@us...> - 2008-11-05 23:24:56
|
Update of /cvsroot/webmacro/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29437 Modified Files: build.xml Log Message: Play nice with Maven, remove extraneous delete, ensure clean cleans up Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/build.xml,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** build.xml 4 Nov 2008 21:42:47 -0000 1.51 --- build.xml 5 Nov 2008 23:24:52 -0000 1.52 *************** *** 83,87 **** <mkdir dir="${javadoc}"/> <mkdir dir="${dist.binary}"/> - <mkdir dir="${examples}/WEB-INF"/> <mkdir dir="${examples}/WEB-INF/classes"/> <mkdir dir="${examples}/WEB-INF/lib"/> --- 83,86 ---- *************** *** 105,111 **** <delete file="${jar}"/> <delete file="${src.jar}"/> <delete dir="${tmpdir}"/> ! <delete dir="${examples}/WEB-INF"/> ! <delete dir="${tmpdir}"/> <ant antfile="test/build.xml" target="unit-clean" /> </target> --- 104,111 ---- <delete file="${jar}"/> <delete file="${src.jar}"/> + <delete file="${adapters-jar}"/> <delete dir="${tmpdir}"/> ! <delete dir="${examples}/WEB-INF/classes" /> ! <delete dir="${examples}/WEB-INF/lib" /> <ant antfile="test/build.xml" target="unit-clean" /> </target> |
From: Tim P <ti...@us...> - 2008-11-05 23:05:44
|
Update of /cvsroot/webmacro/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27651 Modified Files: pom.xml Log Message: Upgrade ant Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pom.xml 5 Nov 2008 22:57:05 -0000 1.13 --- pom.xml 5 Nov 2008 23:05:39 -0000 1.14 *************** *** 312,318 **** <dependencies> <dependency> ! <groupId>ant</groupId> <artifactId>ant</artifactId> ! <version>1.6.5</version> <scope>compile</scope> </dependency> --- 312,318 ---- <dependencies> <dependency> ! <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> ! <version>1.7.0</version> <scope>compile</scope> </dependency> |
From: Tim P <ti...@us...> - 2008-11-05 22:57:18
|
Update of /cvsroot/webmacro/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26928 Modified Files: pom.xml Log Message: Increment version - too late Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pom.xml 4 Nov 2008 20:58:16 -0000 1.12 --- pom.xml 5 Nov 2008 22:57:05 -0000 1.13 *************** *** 4,8 **** <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1-RC1-SNAPSHOT</version> <description> WebMacro is a stable templating engine written in Java. --- 4,8 ---- <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1</version> <description> WebMacro is a stable templating engine written in Java. |
From: Tim P <ti...@us...> - 2008-11-05 00:35:33
|
Update of /cvsroot/webmacro/webmacro/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29452 Added Files: jetty-6.1.5.jar jetty-util-6.1.5.jar jwebunit-core-1.4.1.jar Log Message: Get ant build working --- NEW FILE: jetty-util-6.1.5.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jetty-6.1.5.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jwebunit-core-1.4.1.jar --- (This appears to be a binary file; contents omitted.) |
From: Tim P <ti...@us...> - 2008-11-05 00:18:38
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26938/src/org/webmacro/adapter/spring Modified Files: WebMacroView.java Log Message: Use Eclipse style todo tags Index: WebMacroView.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring/WebMacroView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WebMacroView.java 18 Mar 2008 19:33:31 -0000 1.5 --- WebMacroView.java 5 Nov 2008 00:18:31 -0000 1.6 *************** *** 49,55 **** /** ! * Render the template * ! * @todo Add code here to put in standard context variables used for Spring form stuff * * @param model --- 49,55 ---- /** ! * Render the template. * ! * TODO Add code here to put in standard context variables used for Spring form stuff * * @param model |
From: Tim P <ti...@us...> - 2008-11-05 00:15:25
|
Update of /cvsroot/webmacro/webmacro/examples/WEB-INF In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26508 Modified Files: web.xml Log Message: Add init params to allow out of context servlets Index: web.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/examples/WEB-INF/web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** web.xml 20 Mar 2008 00:09:11 -0000 1.1 --- web.xml 5 Nov 2008 00:15:18 -0000 1.2 *************** *** 24,31 **** <display-name>WebMacro</display-name> <servlet> ! <servlet-name>invoker</servlet-name> ! <servlet-class> ! org.mortbay.jetty.servlet.Invoker ! </servlet-class> </servlet> --- 24,44 ---- <display-name>WebMacro</display-name> <servlet> ! <servlet-name>invoker</servlet-name> ! <servlet-class> ! org.mortbay.jetty.servlet.Invoker ! </servlet-class> ! <init-param> ! <param-name>verbose</param-name> ! <param-value>true</param-value> ! </init-param> ! <init-param> ! <param-name>nonContextServlets</param-name> ! <param-value>true</param-value> ! </init-param> ! <init-param> ! <param-name>dynamicParam</param-name> ! <param-value>anyValue</param-value> ! </init-param> ! <load-on-startup>0</load-on-startup> </servlet> |
From: Tim P <ti...@us...> - 2008-11-04 23:07:23
|
Update of /cvsroot/webmacro/webmacro/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12714 Added Files: WebMacro.defaults Log Message: The default needs o be here for an ant free build --- NEW FILE: WebMacro.defaults --- # DO NOT EDIT THIS FILE -- Edit WebMacro.properties instead! # # This file contains the DEFAULT values for WebMacro CLASSIC. You can # set the actual live values in WebMacro.properties and that will # override the settings in this file. This file also contains examples # of how to set properties, which may be commented out. # # You can override any setting in this file by setting it # in WebMacro.properties. You can remove properties that are set in this # file by setting them to a null value in WebMacro.properties. # # Search order for properties is: # default properties file (WebMacro.defaults) # application properties file (WebMacro.properties or other) # servlet context arguments (2.2 and later, prefixed with org.webmacro) # system properties (prefixed with org.webmacro) ########################################################### # # BASIC CONFIGURATION: # # Character encoding. This is ONLY the encoding that is used to # parse templates. It does not determine the encoding that is # returned to the browser. WebMacro will translate templates from # this encoding to whatever encoding the browser requests. See # the FastWriter class to learn how to control output encoding. TemplateEncoding: UTF-8 TemplateOutputEncoding: UTF-8 # # Logging # # A whitespace separated list of org.webmacro.util.LogTarget # implementations that should should receive your log output. # # WebMacro comes with a default target, LogFile, which logs # to stderr (or a file if the LogFile setting is set, see below). # You can easily create your own implementations that log to your # custom logging system or to Log4J or whatever. LogTargets: org.webmacro.util.LogFile # LogLevel can be: ALL, DEBUG, INFO, NOTICE, WARNING, ERROR, or NONE # in order of most information to least information displayed. # The top level "LogLevel" setting controls the default log level # for any log. You can set specific levels for individual log types # by declaring a value for LogLevel.type. WebMacro itself has the # following types of log messages: # # log the log system itself # wm high level WebMacro behavior # servlet the servlet framework # resource things that load other things (eg: TemplateProvider) # context setting and evaluating properties in a context # engine messages about parsing and executing a tempalte # # There may be more types than that in your system, you can learn # what they are by setting the log level for "log" to INFO. LogLevel: ERROR #LogLevel.log: NOTICE #LogLevel.wm: NOTICE #LogLevel.servlet: NOTICE #LogLevel.resource: NOTICE #LogLevel.context: NOTICE #LogLevel.webcon: NOTICE #LogLevel.engine: NOTICE #LogLevel.directive: NOTICE #LogLevel.parser: NOTICE # LogTraceExceptions causes exception stack traces to be included in the log, # this causes exceptions to be verbose, but may point out the exact line # or method which is causing a fault. LogTraceExceptions: TRUE LogUsingServletLog: TRUE # the following 2 options are used by the org.webmacro.util.LogFile # log target. They do NOT specify system-wide logging options! # # Log format strings. This is a format string to be passed to MessageFormat. # If no format string is specified (the default, since the line below is # commented out), the string "{0,time}\t{1}\t{2}\t{3}" will be used if logging # to a file or to standard error, ,and the string "WebMacro:{1}\t{2}\t{3}" # will be used if logging to the servlet container log (if LogUsingServletLog # is true.) #LogFormat: {0,time}\t{1}\t{2}\t{3} # Use the following to log to a file rather than stderr. If your # standard error writes to a useful log already, you don't need this, # but many servlet runners simply eat standard error. #LogFile: /path/to/log/file # # Error Handling # # Set the template (relative to TemplateDirectory) used for errors. You # can edit this template to customize the way script failures appear # # This template is used by WMServlet, but you can use it for your own # servlets too. ErrorTemplate: error.wm ErrorVariable: error # Set the default ExceptionHandler, which gets control when an evaluation # exception is encountered. ExceptionHandler: org.webmacro.engine.DefaultEvaluationExceptionHandler ########################################################### # # ADVANCED CONFIGURATION # # Don't change these values unless you know what you're doing. They # allow you to fine-tune, extend, and customize WebMacro's behavior. # # Relaxed Directive Building. # # If set to true, text blocks produced by tools such as DreamWeaver # and other html editors will not choke the parse/build phase # when they introduce strings with a preceding # such as # #ffffff, #BeginDirective and #Comment. By default the property is # set to false. Therefore, WebMacro will fail fast on this type of text. RelaxedDirectiveBuilding: False # ResourceProviders are pluggable modules that are used to load # important data and code. You can create your own ResourceProviders # to add new modules to WebMacro, or replace existing modules. # They are all implementations of org.webmacro.broker.ResourceProvider Providers: Providers.template: org.webmacro.resource.TemplateProvider Providers.url: org.webmacro.resource.UrlProvider Providers.config: org.webmacro.resource.ConfigProvider Providers.directive: org.webmacro.directive.DirectiveProvider Providers.parser: org.webmacro.engine.ParserProvider Providers.encoder: org.webmacro.util.EncoderProvider # # Directives # # The DirectiveProvider uses these entries to load directives for the parser. # If you want to remove any of these, simply override the value of # Directive.xxx in your .properties file with an empty value. # You can add new directives by creating Directives.xxx values in your # Properties file, and you can also override the Directives property to # specify a list of directive classes. # Directives implement org.webmacro.directive.Directive # Directives: Directives.attribute: org.webmacro.directive.AttributeDirective Directives.const: org.webmacro.directive.AttributeDirective Directives.include: org.webmacro.directive.IncludeDirective Directives.parse: org.webmacro.directive.IncludeDirective Directives.set: org.webmacro.directive.SetDirective Directives.setprops: org.webmacro.directive.SetpropsDirective Directives.setblock: org.webmacro.directive.SetblockDirective Directives.macro: org.webmacro.directive.MacroDirective Directives.if: org.webmacro.directive.IfDirective Directives.text: org.webmacro.directive.TextDirective Directives.comment: org.webmacro.directive.CommentDirective Directives.foreach: org.webmacro.directive.ForeachDirective Directives.alternate: org.webmacro.directive.AlternateDirective Directives.param: org.webmacro.directive.ParamDirective Directives.type: org.webmacro.directive.TypeDirective Directives.default: org.webmacro.directive.DefaultDirective Directives.count: org.webmacro.directive.CountDirective Directives.bean: org.webmacro.directive.BeanDirective Directives.templet: org.webmacro.directive.TempletDirective Directives.eval: org.webmacro.directive.EvalDirective # # Directive Configuration # # # Should the #type directive be enabled? By default, yes it is. # When moving to a production environment, you should set this # to "false", so as not to incur the overhead of #type type.Enabled = true # # Configuration for #include and #parse # # NOTE: #parse has been deprecated. It is included for backwards # compatibility only. You should instead use: # #include as template "template.wm" # # # TemplateExtensions - a list of (comma-separated) file extensions # that are assumed to be templates when # #include is used without qualifing the # file type. By convention wmm is for WM macro library files. include.TemplateExtensions: .wm, .wmt, .tml, .tmpl, .wmm parse.TemplateExtensions: .wm, .wmt, .tml, .tmpl, .wmm ContextAutoLoaders.ContextTools: org.webmacro.broker.DefaultContextAutoLoader ContextAutoLoaders.WebContextTools: org.webmacro.broker.DefaultContextAutoLoader # The following are tools which are added to your WebContext. You can # customize your WebContext with special tools of your own by adding # them to this list of classes. The only requirement is that the class # be public, and have a public default constructor. The instance will # be shared betwen all instantiations of WebContext, so beware of # thread issues. If it implements the Macro interface it can gain # access to a copy of the Webcontext at runtime. The object will # appear in your WebContext as a variable named after its class, # minus the word "Tool" if it appears. So CGITool below becomes # the variable $CGI in your Template. # # The CGITool adds a $CGI variable with subproperties named after # the familiar CGI variable names, such as $CGI.QUERY_STRING, etc. # # The FormTool adds a $Form variable to your context, with subproperties # named after the available Form fieldnames. eg: $Form.Name would # return the value of HttpServletRequest.getParameterValues("Name")[0] # The FormList tool is similar, but returns the Form value as an array # rather than as a single entry (and is $FormList in the template). # # CookieTool creates a $Cookie variable which can be used to get and # set cookies by name. For example, $Cookie.Password # # SessionTool creates a $Session variable that resovles to the # HttpSession of the current request. WebContextTools: WebContextTools.CGI: org.webmacro.servlet.CGITool WebContextTools.Form: org.webmacro.servlet.FormTool WebContextTools.FormList: org.webmacro.servlet.FormListTool WebContextTools.Cookie: org.webmacro.servlet.CookieTool WebContextTools.Response: org.webmacro.servlet.ResponseTool WebContextTools.Request: org.webmacro.servlet.RequestTool WebContextTools.Session: org.webmacro.servlet.SessionTool ContextTools: ContextTools.Math: org.webmacro.servlet.MathTool ContextTools.Text: org.webmacro.servlet.TextTool ContextTools.Type: org.webmacro.servlet.TypeTool ContextTools.Variable: org.webmacro.servlet.VariableTool ContextTools.List: org.webmacro.servlet.ListTool # The following are the parsers available to WebMacro. The parser # which answers to "wm" will be used for most things, but you can # invoke a different parser by way of the #use directive, if it has # been included. These parsers all implement org.webmacro.engine.Parser Parsers: Parsers.wm: org.webmacro.parser.WMParser # # FastWriter Configuration # # This setting can be tuned for space/time trade-offs. FastWriter.DefaultBufferSize = 4096 # # Template caching # CachingProvider.template.CacheManager: org.webmacro.resource.ReloadingCacheManager CachingProvider.url.CacheManager: org.webmacro.resource.ReloadingCacheManager #CachingProvider.template.CacheManager: org.webmacro.resource.GenerationalCacheManager #CachingProvider.url.CacheManager: org.webmacro.resource.GenerationalCacheManager # # Encoding caching # Encoder.*.CacheManager: org.webmacro.resource.SimpleCacheManager #Encoder.*.CacheManager: org.webmacro.resource.GenerationalCacheManager PropertyOperator.CacheManager: org.webmacro.resource.SimpleCacheManager # ReloadingCacheManager properties (if used) # - An ExpireTime of 0 (zero) means WebMacro will never cache the resource # - A positive ExpireTime means WebMacro will re-fetch the resource every # X milliseconds (ie, 10000 is 10 seconds) # - A negative ExpireTime means WebMacro will only re-fetch resources # when they change. ReloadingCacheManager.*.ExpireTime: 30000 ReloadingCacheManager.*.ReloadOnChange: true # Advanced properties: ReloadingCacheManager.*.UseSoftReferences: TRUE # CheckForReloadDelay sets, how often a cached template should # be checked for reload at maximum. 0 (which is the default) means # to check on every request. Positive values stand for a period # of time in milliseconds. Templates are only checked once in this # interval. # 60 seconds for templates requested via http #CheckForReloadDelay.http=60000 # 10 seconds for normal file templates #CheckForReloadDelay.file=10000 # GenerationalCacheManager properties (if used) # Set reloading to true since we are in development mode by default. GenerationalCacheManager.*.ReloadOnChange: true # The refresh rate for incorporating changes to the mutable image GenerationalCacheManager.*.RefreshRate: 1000 # Classes that are restricted for use in templates RestrictedClasses=java.lang.Class # Methods of the Class class that are allowed in templates RestrictedClasses.AllowedMethods.java.lang.Class=\ getName,isArray,isPrimitive,isAssignableFrom,isInstance # Where does the servlet broker look for templates? Default is the servlet # root, but you could put WEB-INF/templates here. Servlet22Broker.TemplateLocation= # Default settings for DelegatingTemplateProvider # First some template loaders TemplateLoader.default=org.webmacro.resource.FileTemplateLoader TemplateLoader.file=org.webmacro.resource.FileTemplateLoader TemplateLoader.classpath=org.webmacro.resource.ClassPathTemplateLoader TemplateLoader.broker=org.webmacro.resource.BrokerTemplateLoader TemplateLoader.webapp=org.webmacro.resource.ServletContextTemplateLoader # This makes WM backwards compatible to old TemplatePath setting DelegatingTemplateProvider.EmulateTemplatePath: true # and a template loader factory TemplateLoaderFactory=org.webmacro.resource.DefaultTemplateLoaderFactory # To use it, uncomment the following settings #Providers.template: org.webmacro.resource.DelegatingTemplateProvider #TemplateLoaderPath.1=broker: # Define global "functions" which are available to every template # Example: # Functions.myFunc=org.webmacro.SomeClass.myFunkyMethod # If the class is not static, use # Function.myFunc.type=instance # You can even pass arguments to the constructor, like # Function.myFunc.args=[1, "two", [3, 4]] # [Probably not useful, but kind of cool. :} ] Functions.HTMLEscape=org.webmacro.util.HTMLEscaper.escape Functions.URLEncode=org.webmacro.servlet.TextTool.URLEncode Functions.URLDecode=org.webmacro.servlet.TextTool.URLDecode Functions.toList=org.webmacro.servlet.ListUtil.toList Functions.toBoolean=org.webmacro.util.CastUtil.toBoolean Functions.toByte=org.webmacro.util.CastUtil.toByte Functions.toChar=org.webmacro.util.CastUtil.toChar Functions.toDouble=org.webmacro.util.CastUtil.toDouble Functions.toFloat=org.webmacro.util.CastUtil.toFloat Functions.toInt=org.webmacro.util.CastUtil.toInt Functions.toLong=org.webmacro.util.CastUtil.toLong Functions.toShort=org.webmacro.util.CastUtil.toShort Functions.mod=org.webmacro.servlet.MathTool.mod Functions.min=org.webmacro.servlet.MathTool.min Functions.max=org.webmacro.servlet.MathTool.max Functions.pow=org.webmacro.servlet.MathTool.pow Functions.abs=org.webmacro.servlet.MathTool.abs Functions.replace=org.webmacro.servlet.TextTool.replace Functions.split=org.webmacro.servlet.TextTool.split Functions.join=org.webmacro.servlet.TextTool.join Functions.eval=org.webmacro.util.Eval.eval # To include global macro libraries, just put them into # a file at the location you usually load templates from # and put a space separated list after Macros.Include # Example: # Macros.Include: myGlobalMacros.wmm macros2.wmm ## NOTE: The following settings support the servlet org.webmacro.servlet.TemplateServlet ## Normally, these values will be used in the webmacro.properties file to suit # To process a template once once and to make its resultant context # available in every context: #GlobalTemplate.ContextName: global #GlobalTemplate.Resource: global.tml #SessionTemplate.ContextName: session #SessionTemplate.Resource: session.tml #RequestTemplate.ContextName: request #RequestTemplate.Resource: request.tml # If getPathInfo() returns null, use the following default template TemplateServlet.DefaultTemplate: index.tml |