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...> - 2010-02-20 17:32:05
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7614/src/org/webmacro/directive Modified Files: SetpropsDirective.java Log Message: Refactor variable name Index: SetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetpropsDirective.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SetpropsDirective.java 20 Mar 2008 22:30:55 -0000 1.5 --- SetpropsDirective.java 20 Feb 2010 17:31:57 -0000 1.6 *************** *** 143,147 **** String prop; String val; ! StringTemplate stmpl; if (s.length() > 0 && !s.startsWith("#")) { --- 143,147 ---- String prop; String val; ! StringTemplate stringTemplate; if (s.length() > 0 && !s.startsWith("#")) { *************** *** 157,168 **** s = prefix + prop + "=\"" + val + "\""; try { ! stmpl = new StringTemplate(context.getBroker(), s); ! stmpl.evaluateAsString(context); } catch (WebMacroException wme) { // try again without quotes. s = prefix + prop + "=" + val; try { ! stmpl = new StringTemplate(context.getBroker(), s); ! stmpl.evaluateAsString(context); } catch (WebMacroException wme2) { PropertyException pex = new PropertyException( --- 157,168 ---- s = prefix + prop + "=\"" + val + "\""; try { ! stringTemplate = new StringTemplate(context.getBroker(), s); ! stringTemplate.evaluateAsString(context); } catch (WebMacroException wme) { // try again without quotes. s = prefix + prop + "=" + val; try { ! stringTemplate = new StringTemplate(context.getBroker(), s); ! stringTemplate.evaluateAsString(context); } catch (WebMacroException wme2) { PropertyException pex = new PropertyException( |
From: Tim P <ti...@us...> - 2010-02-20 11:10:38
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8981/src/org/webmacro/util Modified Files: Settings.java Log Message: Typo in javadoc, make slightly more debuggable Index: Settings.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Settings.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Settings.java 19 Mar 2008 09:54:24 -0000 1.18 --- Settings.java 20 Feb 2010 11:10:27 -0000 1.19 *************** *** 96,101 **** /** ! * Instantaite a new Settings object using the supplied ! * Settings as the defaults */ public Settings (Settings defaults) --- 96,101 ---- /** ! * Instantiate a new Settings object using the supplied ! * Settings as the defaults. */ public Settings (Settings defaults) *************** *** 181,191 **** String key = (String) e.nextElement(); if (prefix == null) ! _props.setProperty(key, props.getProperty(key)); ! else if (key.startsWith(dotPrefix)) ! _props.setProperty(key.substring(dotPrefix.length()), props.getProperty(key)); } } /** * Load settings from a Properties --- 181,196 ---- String key = (String) e.nextElement(); if (prefix == null) ! setProperty(_props,key, props.getProperty(key)); ! else if (key.startsWith(dotPrefix)) { ! setProperty(_props,key.substring(dotPrefix.length()), props.getProperty(key)); + } } } + private static void setProperty(Properties props, String key, String value) { + //System.out.println("Setting " + key + " to " + value); + props.setProperty(key, value); + } /** * Load settings from a Properties |
From: Tim P <ti...@us...> - 2010-02-20 11:07:24
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8509/test/unit/org/webmacro/template Modified Files: TemplateTestCase.java Log Message: Typo in javadoc Index: TemplateTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TemplateTestCase.java 18 Feb 2010 22:57:49 -0000 1.25 --- TemplateTestCase.java 20 Feb 2010 11:07:11 -0000 1.26 *************** *** 35,40 **** protected void setUp () throws Exception { ! //if (System.getProperties().getProperty("org.webmacro.LogLevel") == null) ! // System.getProperties().setProperty("org.webmacro.LogLevel", "NONE"); _wm = createWebMacro(); _context = _wm.getContext(); --- 35,40 ---- protected void setUp () throws Exception { ! if (System.getProperties().getProperty("org.webmacro.LogLevel") == null) ! System.getProperties().setProperty("org.webmacro.LogLevel", "NONE"); _wm = createWebMacro(); _context = _wm.getContext(); *************** *** 42,46 **** // let subclasses stuff the context with custom data stuffContext(_context); - System.err.println("Called :" + _wm.getBroker()); } --- 42,45 ---- *************** *** 170,174 **** ! /** Asserts that the given template text evalutes to the given result text * when evaluated against the current context */ private void assertStringTemplate(String templateText, --- 169,173 ---- ! /** Asserts that the given template text evaluates to the given result text * when evaluated against the current context */ private void assertStringTemplate(String templateText, |
From: Tim P <ti...@us...> - 2010-02-19 19:49:18
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16151/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Current behaviour is correct Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestSetpropsDirective.java 19 Feb 2010 01:04:13 -0000 1.8 --- TestSetpropsDirective.java 19 Feb 2010 19:48:56 -0000 1.9 *************** *** 38,42 **** } ! public void testSetpropsThrowsOnUnAllowedClass() throws Exception { String tmpl = "#setprops $e class=\"org.webmacro.WM\""; --- 38,42 ---- } ! public void testSetpropsDoesNotThrowIfUnconfigured() throws Exception { String tmpl = "#setprops $e class=\"org.webmacro.WM\""; *************** *** 44,48 **** tmpl += "}\n"; tmpl += "$e"; ! assertStringTemplateThrows(tmpl, WebMacroException.class); } --- 44,48 ---- tmpl += "}\n"; tmpl += "$e"; ! assertStringTemplateEquals(tmpl, "WebMacro(WebMacro.properties)"); } |
From: Tim P <ti...@us...> - 2010-02-19 01:22:38
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10363/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Ensure tests do not interfere with each other Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestSetpropsDirective.java 19 Feb 2010 00:21:30 -0000 1.6 --- TestSetpropsDirective.java 19 Feb 2010 00:49:39 -0000 1.7 *************** *** 27,30 **** --- 27,35 ---- } + protected void tearDown() throws Exception { + super.tearDown(); + Broker.BROKERS.clear(); + } + public void stuffContext(Context context) throws Exception { *************** *** 72,81 **** public void testSetpropsAllowedPackage() throws Exception { ! System.getProperties().setProperty("org.webmacro.AllowedPackages", "org.webmacro"); // overwrite the wm created in setup ! _wm = null; ! _context = null; ! System.err.println("IN"); ! _wm = new WM(Broker.getBroker(new Properties())); _context = _wm.getContext(); --- 77,83 ---- public void testSetpropsAllowedPackage() throws Exception { ! System.getProperties().setProperty("org.webmacro.AllowedPackages", "java.lang,java.util,org.webmacro"); // overwrite the wm created in setup ! Broker.BROKERS.clear(); _wm = new WM(Broker.getBroker(new Properties())); _context = _wm.getContext(); *************** *** 85,88 **** --- 87,91 ---- tmpl += "$WM"; assertStringTemplateEquals(tmpl, "WebMacro(WebMacro.properties)"); + System.getProperties().setProperty("org.webmacro.AllowedPackages", "java.lang,java.util"); } *************** *** 125,128 **** --- 128,137 ---- public void testSetpropsImpliedPackage() throws Exception { + System.getProperties().setProperty("org.webmacro.ImpliedPackages", "java.util"); + // overwrite the wm created in setup + Broker.BROKERS.clear(); + + _wm = new WM(Broker.getBroker(new Properties())); + _context = _wm.getContext(); String tmpl = "#setprops $Prefs class=\"HashMap\""; tmpl += "\n{\n"; |
From: Tim P <ti...@us...> - 2010-02-19 01:12:53
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7444/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Test allowing a package Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TestSetpropsDirective.java 18 Feb 2010 23:29:48 -0000 1.5 --- TestSetpropsDirective.java 19 Feb 2010 00:21:30 -0000 1.6 *************** *** 1,5 **** --- 1,9 ---- package org.webmacro.template; + import java.util.Properties; + + import org.webmacro.Broker; import org.webmacro.Context; + import org.webmacro.WM; import org.webmacro.WebMacroException; import org.webmacro.engine.CrankyEvaluationExceptionHandler; *************** *** 20,27 **** { //System.getProperties().setProperty("org.webmacro.LogLevel", "DEBUG"); - //System.getProperties().setProperty("org.webmacro.ImpliedPackages", - //"java.util"); - //System.getProperties().setProperty("org.webmacro.AllowedPackages", - //"java.util"); super.setUp(); } --- 24,27 ---- *************** *** 67,70 **** --- 67,91 ---- /** + * Tests the "class" option with the AllowedPackages configuration + * option which restricts the classes that can be loaded. + */ + public void testSetpropsAllowedPackage() throws Exception + { + System.getProperties().setProperty("org.webmacro.AllowedPackages", "org.webmacro"); + // overwrite the wm created in setup + _wm = null; + _context = null; + System.err.println("IN"); + + _wm = new WM(Broker.getBroker(new Properties())); + _context = _wm.getContext(); + String tmpl = "#setprops $WM class=\"org.webmacro.WM\""; + tmpl += "\n{\n"; + tmpl += "}\n"; + tmpl += "$WM"; + assertStringTemplateEquals(tmpl, "WebMacro(WebMacro.properties)"); + } + + /** * This version uses the line continuation character. Notice that it needs to * be double escaped here (\\\\). In a template file it should be be escaped *************** *** 114,118 **** } ! public void testSetpropsThrowsOnNotFoundClass() throws Exception { String tmpl = "#setprops $e class=\"org.melati.Melati\""; --- 135,139 ---- } ! public void testSetpropsThrowsOnClassNotFound() throws Exception { String tmpl = "#setprops $e class=\"org.melati.Melati\""; *************** *** 132,149 **** } - /** - * Tests the "class" option with the AllowedPackages configuration - * option which restricts the classes that can be loaded. - */ - public void testSetpropsAllowedPackage() throws Exception - { - String tmpl = "#setprops $WM class=\"org.webmacro.WM\""; - tmpl += "\n{\n"; - tmpl += "}\n"; - tmpl += "$WM"; - System.err.println(_wm.getBroker()); - assertStringTemplateThrows(tmpl, WebMacroException.class); - } - public class User { --- 153,156 ---- |
From: Tim P <ti...@us...> - 2010-02-19 01:04:21
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11890/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Test should be failing Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TestSetpropsDirective.java 19 Feb 2010 00:49:39 -0000 1.7 --- TestSetpropsDirective.java 19 Feb 2010 01:04:13 -0000 1.8 *************** *** 38,41 **** --- 38,50 ---- } + public void testSetpropsThrowsOnUnAllowedClass() throws Exception + { + String tmpl = "#setprops $e class=\"org.webmacro.WM\""; + tmpl += "\n{\n"; + tmpl += "}\n"; + tmpl += "$e"; + assertStringTemplateThrows(tmpl, WebMacroException.class); + } + /** * Test the basic functionality of the directive: create a new hashtable and *************** *** 77,81 **** public void testSetpropsAllowedPackage() throws Exception { ! System.getProperties().setProperty("org.webmacro.AllowedPackages", "java.lang,java.util,org.webmacro"); // overwrite the wm created in setup Broker.BROKERS.clear(); --- 86,90 ---- public void testSetpropsAllowedPackage() throws Exception { ! System.getProperties().setProperty("org.webmacro.AllowedPackages","java.lang,java.util,org.webmacro"); // overwrite the wm created in setup Broker.BROKERS.clear(); *************** *** 153,165 **** } - public void testSetpropsThrowsOnUnAllowedClass() throws Exception - { - String tmpl = "#setprops $e class=\"org.webmacro.WM\""; - tmpl += "\n{\n"; - tmpl += "}\n"; - tmpl += "$e"; - assertStringTemplateThrows(tmpl, WebMacroException.class); - } - public class User { --- 162,165 ---- |
From: Tim P <ti...@us...> - 2010-02-18 23:29:58
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2209/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Test both not found and not allowed Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestSetpropsDirective.java 18 Feb 2010 23:08:56 -0000 1.4 --- TestSetpropsDirective.java 18 Feb 2010 23:29:48 -0000 1.5 *************** *** 114,122 **** } ! /** ! * Tests the "class" option with the ImpliedPackages configuration ! * option which lets you omit the package from the class name. ! */ ! public void testSetpropsThrows() throws Exception { String tmpl = "#setprops $e class=\"org.melati.Melati\""; --- 114,118 ---- } ! public void testSetpropsThrowsOnNotFoundClass() throws Exception { String tmpl = "#setprops $e class=\"org.melati.Melati\""; *************** *** 127,130 **** --- 123,135 ---- } + public void testSetpropsThrowsOnUnAllowedClass() throws Exception + { + String tmpl = "#setprops $e class=\"org.webmacro.WM\""; + tmpl += "\n{\n"; + tmpl += "}\n"; + tmpl += "$e"; + assertStringTemplateThrows(tmpl, WebMacroException.class); + } + /** * Tests the "class" option with the AllowedPackages configuration |
From: Tim P <ti...@us...> - 2010-02-18 23:09:04
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32539/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Use a wierd class to try to instantiate Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestSetpropsDirective.java 18 Feb 2010 22:56:51 -0000 1.3 --- TestSetpropsDirective.java 18 Feb 2010 23:08:56 -0000 1.4 *************** *** 20,27 **** { //System.getProperties().setProperty("org.webmacro.LogLevel", "DEBUG"); ! System.getProperties().setProperty("org.webmacro.ImpliedPackages", ! "java.util"); ! System.getProperties().setProperty("org.webmacro.AllowedPackages", ! "java.util"); super.setUp(); } --- 20,27 ---- { //System.getProperties().setProperty("org.webmacro.LogLevel", "DEBUG"); ! //System.getProperties().setProperty("org.webmacro.ImpliedPackages", ! //"java.util"); ! //System.getProperties().setProperty("org.webmacro.AllowedPackages", ! //"java.util"); super.setUp(); } *************** *** 120,124 **** public void testSetpropsThrows() throws Exception { ! String tmpl = "#setprops $e class=\"java.lang.Exception\""; tmpl += "\n{\n"; tmpl += "}\n"; --- 120,124 ---- public void testSetpropsThrows() throws Exception { ! String tmpl = "#setprops $e class=\"org.melati.Melati\""; tmpl += "\n{\n"; tmpl += "}\n"; |
From: Tim P <ti...@us...> - 2010-02-18 22:58:01
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30935/test/unit/org/webmacro/template Modified Files: TestParseIncludeMacroDistribution.java TestDirectiveParser.java TemplateTestCase.java Log Message: It appears that Maven sometimes fails to call setup Index: TestDirectiveParser.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestDirectiveParser.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestDirectiveParser.java 17 Jul 2003 15:18:29 -0000 1.8 --- TestDirectiveParser.java 18 Feb 2010 22:57:48 -0000 1.9 *************** *** 23,33 **** - public void init () throws Exception - { - System.getProperties().setProperty("org.webmacro.LogLevel", "NONE"); - super.init(); - } - - public void stuffContext (Context context) throws Exception { --- 23,26 ---- Index: TestParseIncludeMacroDistribution.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestParseIncludeMacroDistribution.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestParseIncludeMacroDistribution.java 14 Mar 2008 17:13:02 -0000 1.2 --- TestParseIncludeMacroDistribution.java 18 Feb 2010 22:57:48 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- + /** executes out of the standard macro/ distribution. */ public void testEcommMacros () throws Exception Index: TemplateTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** TemplateTestCase.java 12 Nov 2008 23:41:31 -0000 1.24 --- TemplateTestCase.java 18 Feb 2010 22:57:49 -0000 1.25 *************** *** 29,40 **** protected void setUp () throws Exception { ! init(); } /** ! * create a default-configured instance of WebMacro. Subclasses may * override if WM needs to be created/configured differently. */ --- 29,51 ---- + /** + * Initialize this TemplateTester by creating a WebMacro instance + * and a default Context. + */ protected void setUp () throws Exception { ! //if (System.getProperties().getProperty("org.webmacro.LogLevel") == null) ! // System.getProperties().setProperty("org.webmacro.LogLevel", "NONE"); ! _wm = createWebMacro(); ! _context = _wm.getContext(); ! ! // let subclasses stuff the context with custom data ! stuffContext(_context); ! System.err.println("Called :" + _wm.getBroker()); } /** ! * Create a default-configured instance of WebMacro. Subclasses may * override if WM needs to be created/configured differently. */ *************** *** 45,62 **** - /** - * initialize this TemplateTester by creating a WebMacro instance - * and a default Context. - */ - public void init () throws Exception - { - if (System.getProperties().getProperty("org.webmacro.LogLevel") == null) - System.getProperties().setProperty("org.webmacro.LogLevel", "NONE"); - _wm = createWebMacro(); - _context = _wm.getContext(); - - // let subclasses stuff the context with custom data - stuffContext(_context); - } --- 56,59 ---- *************** *** 243,246 **** --- 240,244 ---- { caught = e; + e.printStackTrace(); } if (caught == null) |
From: Tim P <ti...@us...> - 2010-02-18 22:57:07
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30732/test/unit/org/webmacro/template Modified Files: TestSetpropsDirective.java Log Message: Add test which should fail Index: TestSetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestSetpropsDirective.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestSetpropsDirective.java 12 Nov 2008 23:41:31 -0000 1.2 --- TestSetpropsDirective.java 18 Feb 2010 22:56:51 -0000 1.3 *************** *** 19,31 **** 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(); } --- 19,28 ---- protected void setUp () throws Exception { ! //System.getProperties().setProperty("org.webmacro.LogLevel", "DEBUG"); System.getProperties().setProperty("org.webmacro.ImpliedPackages", ! "java.util"); ! System.getProperties().setProperty("org.webmacro.AllowedPackages", ! "java.util"); ! super.setUp(); } *************** *** 36,40 **** } ! /* * Test the basic functionality of the directive: create a new hashtable and * sets a simple property. --- 33,37 ---- } ! /** * Test the basic functionality of the directive: create a new hashtable and * sets a simple property. *************** *** 46,50 **** } ! /* * Test the creation of an empty map. */ --- 43,47 ---- } ! /** * Test the creation of an empty map. */ *************** *** 55,59 **** } ! /* * This version set properties on a POJO instead of the default hashtable. */ --- 52,56 ---- } ! /** * This version set properties on a POJO instead of the default hashtable. */ *************** *** 69,73 **** } ! /* * This version uses the line continuation character. Notice that it needs to * be double escaped here (\\\\). In a template file it should be be escaped --- 66,70 ---- } ! /** * This version uses the line continuation character. Notice that it needs to * be double escaped here (\\\\). In a template file it should be be escaped *************** *** 85,89 **** } ! /* * This tests the "class" option which lets you construct any class with a * no-arg constructor. --- 82,86 ---- } ! /** * This tests the "class" option which lets you construct any class with a * no-arg constructor. *************** *** 101,106 **** } ! /* ! * This tests the "class" option with the ImpliedPackages configuration * option which lets you omit the package from the class name. */ --- 98,103 ---- } ! /** ! * Tests the "class" option with the ImpliedPackages configuration * option which lets you omit the package from the class name. */ *************** *** 117,122 **** } ! /* ! * This tests the "class" option with the AllowedPackages configuration * option which restricts the classes that can be loaded. */ --- 114,132 ---- } ! /** ! * Tests the "class" option with the ImpliedPackages configuration ! * option which lets you omit the package from the class name. ! */ ! public void testSetpropsThrows() throws Exception ! { ! String tmpl = "#setprops $e class=\"java.lang.Exception\""; ! tmpl += "\n{\n"; ! tmpl += "}\n"; ! tmpl += "$e"; ! assertStringTemplateThrows(tmpl, WebMacroException.class); ! } ! ! /** ! * Tests the "class" option with the AllowedPackages configuration * option which restricts the classes that can be loaded. */ *************** *** 127,130 **** --- 137,141 ---- tmpl += "}\n"; tmpl += "$WM"; + System.err.println(_wm.getBroker()); assertStringTemplateThrows(tmpl, WebMacroException.class); } |
From: Tim P <ti...@us...> - 2010-02-18 22:50:28
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30039/src/org/webmacro/directive Modified Files: IncludeDirective.java Log Message: Typo Index: IncludeDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** IncludeDirective.java 19 Mar 2008 12:52:14 -0000 1.26 --- IncludeDirective.java 18 Feb 2010 22:50:12 -0000 1.27 *************** *** 523,527 **** catch (Exception e) { ! throw makePropertyException("Unexpected ectpion while getting template"); } } --- 523,527 ---- catch (Exception e) { ! throw makePropertyException("Unexpected exception while getting template"); } } |
From: Tim P <ti...@us...> - 2010-02-18 22:35:57
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28316/test/unit/org/webmacro/template Modified Files: ecomm.wm Log Message: Typo Index: ecomm.wm =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/ecomm.wm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ecomm.wm 21 Jul 2003 05:49:47 -0000 1.3 --- ecomm.wm 18 Feb 2010 22:35:38 -0000 1.4 *************** *** 1 **** ! #comment { ecomm.wm A template to excercise the standard eCommerce macros supplied with WM. } #include as macro "allmacros.wmm" ## set up some useful data for the transaction. ## see the paypalSetup macro for the property name specs. #bean $System = "java.lang.System" scope=static ## verisign data... #bean $App = "org.webmacro.util.SparseProperties" scope=page onNew { #set $App.LoginName = "lanesharman" #set $App.PartnerName = "VeriSign" } #bean $Tran = "org.webmacro.util.SparseProperties" scope=page onNew { #set $Tran.Amount = "100.00" #set $Tran.TranType = "S" } #bean $cust = "org.webmacro.util.SparseProperties" scope=page onNew { #set $cust.firstName = $System.getProperty("user.name") } ## set all the tran properties #bean $tran = "org.webmacro.util.SparseProperties" scope=page onNew { #set $tran.sellersEmailAccount = "su...@op..." #set $tran.itemName = "WebMacro Dues" #set $tran.itemNumber = "9092" #set $tran.amount = "25.00" #set $tran.specialInstructions = "Your Dues Help Support WebMacro Publicity!" } #bean $app = "org.webmacro.util.SparseProperties" scope=page onNew { #set $app.returnURL = "http://www.webmacro.org" #set $app.cancelURL = "http://www.webmacro.org/CancelDues" } ## now invoke the paypal macro with some supporting html so it can be viewed <html> <center> $cust.firstName: <p> Please Pay Your WebMacro Dues Today at PayPal. <br> $tran.amount is due and will keep your WebMacro subscritpion rolling. <p> #paypalSetup($cust, $tran, $app) <hr> #bean $bongoTran = "org.webmacro.util.SparseProperties" scope=page onNew { #set $bongoTran.sellersEmailAccount = "sa...@op..." #set $bongoTran.itemName = "Bongo Annual Subscription" #set $bongoTran.itemNumber = "9102" #set $bongoTran.amount = "72.00" #set $bongoTran.specialInstructions = "Your Dues Help Support WebMacro Publicity!" } #set $app.returnURL = "http://opendoors.com/bongo/paid" #set $app.cancelURL = "http://opendoors.com/bongo/cancel" <p> Also, please consider a one year subscription to bongo. <br> The most amazing graphical interface builder for java! Just $bongoTran.amount USD. #paypalSubscribe($cust, $bongoTran, $app); </center> </html> \ No newline at end of file --- 1 ---- ! #comment { ecomm.wm A template to exercise the standard eCommerce macros supplied with WM. } #include as macro "allmacros.wmm" ## set up some useful data for the transaction. ## see the paypalSetup macro for the property name specs. #bean $System = "java.lang.System" scope=static ## verisign data... #bean $App = "org.webmacro.util.SparseProperties" scope=page onNew { #set $App.LoginName = "lanesharman" #set $App.PartnerName = "VeriSign" } #bean $Tran = "org.webmacro.util.SparseProperties" scope=page onNew { #set $Tran.Amount = "100.00" #set $Tran.TranType = "S" } #bean $cust = "org.webmacro.util.SparseProperties" scope=page onNew { #set $cust.firstName = $System.getProperty("user.name") } ## set all the tran properties #bean $tran = "org.webmacro.util.SparseProperties" scope=page onNew { #set $tran.sellersEmailAccount = "su...@op..." #set $tran.itemName = "WebMacro Dues" #set $tran.itemNumber = "9092" #set $tran.amount = "25.00" #set $tran.specialInstructions = "Your Dues Help Support WebMacro Publicity!" } #bean $app = "org.webmacro.util.SparseProperties" scope=page onNew { #set $app.returnURL = "http://www.webmacro.org" #set $app.cancelURL = "http://www.webmacro.org/CancelDues" } ## now invoke the paypal macro with some supporting html so it can be viewed <html> <center> $cust.firstName: <p> Please Pay Your WebMacro Dues Today at PayPal. <br> $tran.amount is due and will keep your WebMacro subscritpion rolling. <p> #paypalSetup($cust, $tran, $app) <hr> #bean $bongoTran = "org.webmacro.util.SparseProperties" scope=page onNew { #set $bongoTran.sellersEmailAccount = "sa...@op..." #set $bongoTran.itemName = "Bongo Annual Subscription" #set $bongoTran.itemNumber = "9102" #set $bongoTran.amount = "72.00" #set $bongoTran.specialInstructions = "Your Dues Help Support WebMacro Publicity!" } #set $app.returnURL = "http://opendoors.com/bongo/paid" #set $app.cancelURL = "http://opendoors.com/bongo/cancel" <p> Also, please consider a one year subscription to bongo. <br> The most amazing graphical interface builder for java! Just $bongoTran.amount USD. #paypalSubscribe($cust, $bongoTran, $app); </center> </html> \ No newline at end of file |
From: Tim P <ti...@us...> - 2010-02-18 22:12:24
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25942 Modified Files: pom.xml Log Message: Add CI, Guy and make tests fork pertest Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pom.xml 12 Nov 2008 23:23:29 -0000 1.16 --- pom.xml 18 Feb 2010 22:12:04 -0000 1.17 *************** *** 13,16 **** --- 13,20 ---- </issueManagement> <inceptionYear>1999</inceptionYear> + <ciManagement> + <system>Hudson</system> + <url>http://hudson.paneris.net/</url> + </ciManagement> <mailingLists> <mailingList> *************** *** 85,88 **** --- 89,103 ---- </developer> <developer> + <id>guyboltonking</id> + <name>Guy Bolton King</name> + <email>guyboltonking AT users.sourceforge.net</email> + <url></url> + <organization>WebMacro</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> <id>keats</id> <name>Keats Kirsch</name> *************** *** 236,253 **** <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> ! <!-- forkMode>once</forkMode --> <!-- threadCount>1</threadCount--> <childDelegation>false</childDelegation> <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> --- 251,262 ---- <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> ! <forkMode>pertest</forkMode> <!-- threadCount>1</threadCount--> <childDelegation>false</childDelegation> <useFile>true</useFile> <excludes> <!-- Maven HACK --> <exclude>**/*$*</exclude> <!-- works in eclipse, but not maven --> <!-- exclude>**/TestSetpropsDirective.java</exclude --> </excludes> *************** *** 287,291 **** <configuration> <instrumentation> ! <!-- Test source shouldnot be included, but seems to be --> <excludes> <exclude>**/CheckConfig.class</exclude> --- 296,300 ---- <configuration> <instrumentation> ! <!-- Test source should not be included, but seems to be --> <excludes> <exclude>**/CheckConfig.class</exclude> *************** *** 412,419 **** <artifactId>cobertura-maven-plugin</artifactId> </plugin> - <!-- plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changelog-plugin</artifactId> - </plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> --- 421,424 ---- |
From: Tim P <ti...@us...> - 2010-02-18 21:17:12
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15451/src/org/webmacro/parser Modified Files: WMParser_impl.java Log Message: Fix dead code warnings: maybe they will not come back when we regenerate with latest javacc Index: WMParser_impl.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** WMParser_impl.java 18 Mar 2008 21:00:41 -0000 1.59 --- WMParser_impl.java 18 Feb 2010 21:16:54 -0000 1.60 *************** *** 567,572 **** ; } ! {if (true) return lv;} ! throw new Error("Missing return statement in function"); } --- 567,571 ---- ; } ! return lv; } *************** *** 590,595 **** ; } ! {if (true) return rv;} ! throw new Error("Missing return statement in function"); } --- 589,593 ---- ; } ! return rv; } *************** *** 717,722 **** ; } ! {if (true) return t.image;} ! throw new Error("Missing return statement in function"); } --- 715,719 ---- ; } ! return t.image; } *************** *** 742,747 **** } jj_consume_token(RPAREN); ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 739,743 ---- } jj_consume_token(RPAREN); ! return e; } *************** *** 775,780 **** } } ! {if (true) return element;} ! throw new Error("Missing return statement in function"); } --- 771,775 ---- } } ! return element; } *************** *** 845,850 **** } Object[] names = v.toArray(); ! {if (true) return new VariableBuilder(names);} ! throw new Error("Missing return statement in function"); } --- 840,844 ---- } Object[] names = v.toArray(); ! return new VariableBuilder(names); } *************** *** 953,958 **** } SetState(entryState); ! {if (true) return qs;} ! throw new Error("Missing return statement in function"); } --- 947,951 ---- } SetState(entryState); ! return qs; } *************** *** 973,978 **** throw new ParseException(); } ! {if (true) return b;} ! throw new Error("Missing return statement in function"); } --- 966,970 ---- throw new ParseException(); } ! return b; } *************** *** 1243,1248 **** ; } ! {if (true) return map;} ! throw new Error("Missing return statement in function"); } --- 1235,1239 ---- ; } ! return map; } *************** *** 1286,1291 **** jj_consume_token(RBRACE); SetState(WM); ! {if (true) return map;} ! throw new Error("Missing return statement in function"); } --- 1277,1281 ---- jj_consume_token(RBRACE); SetState(WM); ! return map; } *************** *** 1361,1366 **** ; } ! {if (true) return list;} ! throw new Error("Missing return statement in function"); } --- 1351,1355 ---- ; } ! return list; } *************** *** 1370,1375 **** list = ArgList(); jj_consume_token(RBRACKET); ! {if (true) return list;} ! throw new Error("Missing return statement in function"); } --- 1359,1363 ---- list = ArgList(); jj_consume_token(RBRACKET); ! return list; } *************** *** 1444,1449 **** ; } ! {if (true) return list.toArray();} ! throw new Error("Missing return statement in function"); } --- 1432,1436 ---- ; } ! return list.toArray(); } *************** *** 1460,1465 **** ; } ! {if (true) return list;} ! throw new Error("Missing return statement in function"); } --- 1447,1451 ---- ; } ! return list; } *************** *** 1547,1552 **** throw new ParseException(); } ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 1533,1537 ---- throw new ParseException(); } ! return e; } *************** *** 1598,1603 **** {if (true) throw new ParseException("internal parser error in Factor()");} } ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 1583,1587 ---- {if (true) throw new ParseException("internal parser error in Factor()");} } ! return e; } *************** *** 1649,1654 **** {if (true) throw new ParseException("internal parser error in AExpression()");} } ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 1633,1637 ---- {if (true) throw new ParseException("internal parser error in AExpression()");} } ! return e; } *************** *** 1682,1687 **** throw new ParseException(); } ! {if (true) return t;} ! throw new Error("Missing return statement in function"); } --- 1665,1669 ---- throw new ParseException(); } ! return t; } *************** *** 1717,1721 **** } if (op == null) ! {if (true) return e1;} else switch (op.kind) { case OP_EQ: {if (true) return new Expression.CompareEqBuilder(e1, e2);} --- 1699,1703 ---- } if (op == null) ! return e1; else switch (op.kind) { case OP_EQ: {if (true) return new Expression.CompareEqBuilder(e1, e2);} *************** *** 1727,1733 **** case OP_LT: {if (true) return new Expression.CompareLtBuilder(e1, e2);} default: ! {if (true) throw new ParseException("internal parser error in CExpression()");} } - throw new Error("Missing return statement in function"); } --- 1709,1714 ---- case OP_LT: {if (true) return new Expression.CompareLtBuilder(e1, e2);} default: ! throw new ParseException("internal parser error in CExpression()"); } } *************** *** 1762,1767 **** e = new Expression.AndBuilder(e, e2); } ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 1743,1747 ---- e = new Expression.AndBuilder(e, e2); } ! return e; } *************** *** 1796,1801 **** e = new Expression.OrBuilder(e, e2); } ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 1776,1780 ---- e = new Expression.OrBuilder(e, e2); } ! return e; } *************** *** 1803,1808 **** Object e=null; e = OrExpression(); ! {if (true) return e;} ! throw new Error("Missing return statement in function"); } --- 1782,1786 ---- Object e=null; e = OrExpression(); ! return e; } *************** *** 1879,1884 **** } SetState(entryState); ! {if (true) return o;} ! throw new Error("Missing return statement in function"); } --- 1857,1861 ---- } SetState(entryState); ! return o; } *************** *** 2122,2127 **** } } ! {if (true) return block;} ! throw new Error("Missing return statement in function"); } --- 2099,2103 ---- } } ! return block; } *************** *** 2209,2214 **** case 0: jj_consume_token(0); ! {if (true) throw new ParseException("Unclosed block beginning at line " + token.beginLine + ". Check for invalid directive options or missing a #end");} ! break; case RBRACE: case LBRACE: --- 2185,2189 ---- case 0: jj_consume_token(0); ! throw new ParseException("Unclosed block beginning at line " + token.beginLine + ". Check for invalid directive options or missing a #end"); case RBRACE: case LBRACE: *************** *** 2248,2253 **** } blockStack.pop(); ! {if (true) return block;} ! throw new Error("Missing return statement in function"); } --- 2223,2227 ---- } blockStack.pop(); ! return block; } *************** *** 2314,2319 **** } jj_consume_token(0); ! {if (true) return block;} ! throw new Error("Missing return statement in function"); } --- 2288,2292 ---- } jj_consume_token(0); ! return block; } |
From: Tim P <ti...@us...> - 2010-02-18 17:08:33
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7658/src/org/webmacro/servlet Modified Files: WMServlet.java Log Message: Add generated serial Index: WMServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** WMServlet.java 13 Nov 2008 00:37:12 -0000 1.67 --- WMServlet.java 18 Feb 2010 17:08:23 -0000 1.68 *************** *** 68,72 **** { ! private WebMacro _wm = null; private Broker _broker = null; private boolean _started = false; --- 68,74 ---- { ! private static final long serialVersionUID = -4903102471116106113L; ! ! private WebMacro _wm = null; private Broker _broker = null; private boolean _started = false; |
From: Tim P <ti...@us...> - 2009-03-03 14:55:10
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13935/src/org/webmacro Modified Files: Template.java Log Message: Spelling Index: Template.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Template.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Template.java 27 Mar 2008 19:40:03 -0000 1.21 --- Template.java 3 Mar 2009 14:54:57 -0000 1.22 *************** *** 28,31 **** --- 28,32 ---- import java.util.Map; + /** * Defines the type of object which contains *************** *** 47,52 **** * have to create a new Template object and leave this one to the garbage collector. * ! * @exception TemplateException if the sytax was invalid and we could not recover ! * @exception IOException if we could not successfullly read the parseTool */ public void parse () throws IOException, TemplateException; --- 48,53 ---- * have to create a new Template object and leave this one to the garbage collector. * ! * @exception TemplateException if the syntax was invalid and we could not recover ! * @exception IOException if we could not successfully read the parseTool */ public void parse () throws IOException, TemplateException; *************** *** 75,79 **** /** ! * set a parameter. Occasinally it's necessary to provide parameters * externally. Although these might be considered of a different nature to * those set by #param, they can be stored as such. --- 76,80 ---- /** ! * Set a parameter. Occasionally it's necessary to provide parameters * externally. Although these might be considered of a different nature to * those set by #param, they can be stored as such. *************** *** 115,118 **** --- 116,120 ---- throws PropertyException; + } |
From: Tim P <ti...@us...> - 2009-02-20 13:38:07
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6605/src/org/webmacro/engine Modified Files: WMTemplate.java Log Message: Eclipse has a built in spell checker now Index: WMTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/WMTemplate.java,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** WMTemplate.java 25 Mar 2008 22:56:02 -0000 1.53 --- WMTemplate.java 20 Feb 2009 13:37:55 -0000 1.54 *************** *** 242,246 **** * * @return the #macro's defined for this template, or null if this template has ! * not yet beed <code>parse()'d</code>. */ public Map getMacros () --- 242,246 ---- * * @return the #macro's defined for this template, or null if this template has ! * not yet been <code>parse()'d</code>. */ public Map getMacros () |
From: Tim P <ti...@us...> - 2008-11-13 00:37:18
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv477/src/org/webmacro/servlet Modified Files: WMServlet.java Log Message: Undo, cast is necessary for var args, Eclipse bad. Index: WMServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** WMServlet.java 13 Nov 2008 00:32:57 -0000 1.66 --- WMServlet.java 13 Nov 2008 00:37:12 -0000 1.67 *************** *** 737,741 **** new Class[] {Locale.class}); ! m.invoke(resp, new Locale[]{locale}); if (_log.loggingDebug()) _log.debug("Successfully set locale to " + locale); --- 737,741 ---- new Class[] {Locale.class}); ! m.invoke(resp, (Object[])new Locale[]{locale}); if (_log.loggingDebug()) _log.debug("Successfully set locale to " + locale); |
From: Tim P <ti...@us...> - 2008-11-13 00:33:03
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31393/src/org/webmacro/servlet Modified Files: WMServlet.java Log Message: Unnecessary cast Index: WMServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** WMServlet.java 19 Mar 2008 12:28:53 -0000 1.65 --- WMServlet.java 13 Nov 2008 00:32:57 -0000 1.66 *************** *** 737,741 **** new Class[] {Locale.class}); ! m.invoke(resp, (Object[])new Locale[]{locale}); if (_log.loggingDebug()) _log.debug("Successfully set locale to " + locale); --- 737,741 ---- new Class[] {Locale.class}); ! m.invoke(resp, new Locale[]{locale}); if (_log.loggingDebug()) _log.debug("Successfully set locale to " + locale); |
From: Tim P <ti...@us...> - 2008-11-13 00:28:24
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30626/src/org/webmacro/parser Modified Files: WMParser_impl.jj Log Message: Unnecessary cast Index: WMParser_impl.jj =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.jj,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** WMParser_impl.jj 18 Mar 2008 21:01:01 -0000 1.54 --- WMParser_impl.jj 13 Nov 2008 00:28:18 -0000 1.55 *************** *** 750,754 **** LOOKAHEAD(<WORD><LPAREN>) t=<WORD> <LPAREN> argList=ArgList() <RPAREN> ! { element = new FunctionCallBuilder((String) t.image, argList); } | t=<WORD> { element=t.image; } ) --- 750,754 ---- LOOKAHEAD(<WORD><LPAREN>) t=<WORD> <LPAREN> argList=ArgList() <RPAREN> ! { element = new FunctionCallBuilder(t.image, argList); } | t=<WORD> { element=t.image; } ) |
From: Tim P <ti...@us...> - 2008-11-13 00:11:46
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26846/src/org/webmacro/util Modified Files: SparseProperties.java Log Message: Unnecessary cast Index: SparseProperties.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/SparseProperties.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SparseProperties.java 31 Oct 2005 02:46:41 -0000 1.8 --- SparseProperties.java 13 Nov 2008 00:11:43 -0000 1.9 *************** *** 107,111 **** { String k = (String) e.nextElement(); ! this.setProperty(k, (String) request.getParameter(k)); System.out.println(k + ":" + request.getParameter(k)); } --- 107,111 ---- { String k = (String) e.nextElement(); ! this.setProperty(k, request.getParameter(k)); System.out.println(k + ":" + request.getParameter(k)); } |
From: Tim P <ti...@us...> - 2008-11-13 00:11:24
|
Update of /cvsroot/webmacro/webmacro/examples In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26699/examples Modified Files: GuestBook.java Log Message: Unnecessary cast Index: GuestBook.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/examples/GuestBook.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GuestBook.java 27 Mar 2008 00:17:34 -0000 1.11 --- GuestBook.java 13 Nov 2008 00:11:18 -0000 1.12 *************** *** 55,62 **** // get the form variables ! output = (String) context.getForm("loadFile"); ! String name = (String) context.getForm("name"); ! String email = (String) context.getForm("email"); ! String comment = (String) context.getForm("comment"); if (output == null) { --- 55,62 ---- // get the form variables ! output = context.getForm("loadFile"); ! String name = context.getForm("name"); ! String email = context.getForm("email"); ! String comment = context.getForm("comment"); if (output == null) { |
From: Tim P <ti...@us...> - 2008-11-13 00:06:41
|
Update of /cvsroot/webmacro/webmacro/examples In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24976/examples Modified Files: CheckConfig.java Log Message: Unnecessary cast Index: CheckConfig.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/examples/CheckConfig.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CheckConfig.java 17 Mar 2008 12:16:29 -0000 1.4 --- CheckConfig.java 13 Nov 2008 00:06:34 -0000 1.5 *************** *** 129,133 **** hdrCnt++; String hdr = (String)hdrs.nextElement(); ! String val = (String)req.getHeader(hdr); System.out.println("Req header " + hdrCnt + ", " + hdr + "=" + val); } --- 129,133 ---- hdrCnt++; String hdr = (String)hdrs.nextElement(); ! String val = req.getHeader(hdr); System.out.println("Req header " + hdrCnt + ", " + hdr + "=" + val); } |
From: Tim P <ti...@us...> - 2008-11-13 00:03:00
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23956/test/unit/org/webmacro/template Modified Files: TestGetSet.java Log Message: Unnecessary cast Index: TestGetSet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestGetSet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestGetSet.java 1 Apr 2005 05:28:57 -0000 1.9 --- TestGetSet.java 13 Nov 2008 00:02:54 -0000 1.10 *************** *** 116,120 **** context.put("TestObject", to); ! context.put("two", (int) 2); context.put("twoLong", (long) 2); --- 116,120 ---- context.put("TestObject", to); ! context.put("two", 2); context.put("twoLong", (long) 2); |