webmacro-cvs — receive cvs commit messages

[WebMacro-cvs] webmacro/src/org/webmacro/directive Directive.java,1.19,1.20

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv18116/src/org/webmacro/directive

Modified Files:
	Directive.java 
Log Message:
- When the parser outputs warnings for $$ and $foo;, include the line.col information
- fix Directive.writeWarning so it doesn't output HTML comments to the log


Index: Directive.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/Directive.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Directive.java	11 Nov 2002 04:26:12 -0000	1.19
--- Directive.java	11 Nov 2002 04:53:11 -0000	1.20
***************
*** 116,121 ****
      */
     protected static void writeWarning(String warning, Context context, FastWriter writer) throws IOException, PropertyException {
!        warning = getWarningText(warning, context);
!        context.getLog("directive").warning(warning);
         writer.write(getWarningText(warning, context));
     }
--- 116,120 ----
      */
     protected static void writeWarning(String warning, Context context, FastWriter writer) throws IOException, PropertyException {
!        context.getLog("directive").warning(warning + " at " + context.getCurrentLocation());
         writer.write(getWarningText(warning, context));
     }

[WebMacro-cvs] webmacro/src/org/webmacro/directive AlternateDirective.java,1.9,1.10 BeanDirective.java,1.9,1.10 CountDirective.java,1.2,1.3 DefaultDirective.java,1.3,1.4 Directive.java,1.18,1.19 ForeachDirective.java,1.16,1.17 IfDirective.java,1.13,1.14 SetDirective.java,1.13,1.14 SetblockDirective.java,1.3,1.4

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv9803/src/org/webmacro/directive

Modified Files:
	AlternateDirective.java BeanDirective.java CountDirective.java 
	DefaultDirective.java Directive.java ForeachDirective.java 
	IfDirective.java SetDirective.java SetblockDirective.java 
Log Message:
- Changed Directive.writeWarning() to always include the context.currentLocation() and to always write the warning message to a log named "directive".  Adjusted directives that use .writeWarning().

- Added a test case for #count


Index: AlternateDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/AlternateDirective.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AlternateDirective.java	11 Jun 2002 17:43:20 -0000	1.9
--- AlternateDirective.java	11 Nov 2002 04:26:12 -0000	1.10
***************
*** 113,117 ****
        catch (Exception e) {
           String warning = "#alternate: list argument is not a list: " + l;
-          context.getLog("engine").warning(warning + "; " + e);
           writeWarning(warning, context, out);
           return;
--- 113,116 ----

Index: BeanDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/BeanDirective.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BeanDirective.java	12 Jun 2002 17:17:28 -0000	1.9
--- BeanDirective.java	11 Nov 2002 04:26:12 -0000	1.10
***************
*** 252,256 ****
        catch (Exception e) {
           String errorText = "BeanDirective: Unable to load bean " + target + " of type " + _className;
-          _log.error(errorText, e);
           writeWarning(errorText, context, out);
        }
--- 252,255 ----

Index: CountDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/CountDirective.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CountDirective.java	25 Oct 2002 01:41:05 -0000	1.2
--- CountDirective.java	11 Nov 2002 04:26:12 -0000	1.3
***************
*** 41,45 ****
      };
  
!     private static final DirectiveDescriptor _desc = new DirectiveDescriptor("for", null, _args, null);
  
      public static DirectiveDescriptor getDescriptor() {
--- 41,45 ----
      };
  
!     private static final DirectiveDescriptor _desc = new DirectiveDescriptor("count", null, _args, null);
  
      public static DirectiveDescriptor getDescriptor() {
***************
*** 109,114 ****
              if (tmp != null)
                  start = Integer.parseInt(tmp.toString());
!             else
!                 throw new PropertyException ("Starting value cannot be null");
          }
  
--- 109,116 ----
              if (tmp != null)
                  start = Integer.parseInt(tmp.toString());
!             else {
!                 writeWarning("#count: Starting value cannot be null.  Not counting", context, out);
!                 return;
!             }
          }
  
***************
*** 118,123 ****
              if (tmp != null)
                  end = Integer.parseInt(tmp.toString());
!             else
!                 throw new PropertyException ("Ending value cannot be null");
          }
  
--- 120,127 ----
              if (tmp != null)
                  end = Integer.parseInt(tmp.toString());
!             else {
!                 writeWarning("#count: Ending value cannot be null.  Not counting", context, out);
!                 return;
!             }
          }
  
***************
*** 127,138 ****
              if (tmp != null)
                  step = Integer.parseInt(tmp.toString());
!             else
!                 throw new PropertyException ("Step value cannot be null");
          }
  
!         // just do it
!         for (; start<=end; start+=step) {
!             _iterator.setValue(context, new Integer(start));
!             _body.write(out, context);
          }
      }
--- 131,152 ----
              if (tmp != null)
                  step = Integer.parseInt(tmp.toString());
!             else {
!                 writeWarning("#count: Starting value cannot be null.  Not counting", context, out);
!                 return;
!             }
          }
  
!         if (step > 0) {
!             for (; start<=end; start+=step) {
!                 _iterator.setValue(context, new Integer(start));
!                 _body.write(out, context);
!             }
!         } else if (step < 0) {
!             for (; start>=end; start+=step) {
!                 _iterator.setValue(context, new Integer(start));
!                 _body.write(out, context);
!             }
!         } else {
!             writeWarning("#count: step cannot be 0.  Not counting", context, out);
          }
      }

Index: DefaultDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/DefaultDirective.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultDirective.java	11 Jun 2002 17:43:20 -0000	1.3
--- DefaultDirective.java	11 Nov 2002 04:26:12 -0000	1.4
***************
*** 92,96 ****
        catch (Exception e) {
           String errorText = "#default: Unable to set default value for " + target;
-          context.getBroker().getLog("engine").error(errorText);
           writeWarning(errorText, context, out);
        }
--- 92,95 ----

Index: Directive.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/Directive.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Directive.java	12 Jun 2002 17:17:28 -0000	1.18
--- Directive.java	11 Nov 2002 04:26:12 -0000	1.19
***************
*** 105,109 ****
           throws IOException, PropertyException {
        return context.getEvaluationExceptionHandler()
!             .warningString("WARNING: " + warning);
     }
  
--- 105,109 ----
           throws IOException, PropertyException {
        return context.getEvaluationExceptionHandler()
!             .warningString("WARNING: " + warning + " at " + context.getCurrentLocation());
     }
  
***************
*** 111,122 ****
      * Convenience method for directives to write HTML warnings into the output
      * stream.  Eventually this will be parameterizable so that HTML is not
!     * assumed to be the only underlying language.
      */
! 
!    protected static void writeWarning(String warning,
!                                       Context context,
!                                       FastWriter writer)
!          throws IOException, PropertyException {
!       writer.write(getWarningText(warning, context));
     }
  
--- 111,122 ----
      * Convenience method for directives to write HTML warnings into the output
      * stream.  Eventually this will be parameterizable so that HTML is not
!     * assumed to be the only underlying language.<p>
!     *
!     * This method also outputs the same warning message to a log named "directive"
      */
!    protected static void writeWarning(String warning, Context context, FastWriter writer) throws IOException, PropertyException {
!        warning = getWarningText(warning, context);
!        context.getLog("directive").warning(warning);
!        writer.write(getWarningText(warning, context));
     }
  

Index: ForeachDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/ForeachDirective.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ForeachDirective.java	31 Oct 2002 17:34:03 -0000	1.16
--- ForeachDirective.java	11 Nov 2002 04:26:12 -0000	1.17
***************
*** 113,117 ****
           else {
              String warning = "#foreach: Cannot evaluate limit";
-             context.getLog("engine").warning(warning);
              writeWarning(warning, context, out);
           }
--- 113,116 ----
***************
*** 126,130 ****
           else {
              String warning = "#foreach: Cannot evaluate loop start";
-             context.getLog("engine").warning(warning);
              writeWarning(warning, context, out);
           }
--- 125,128 ----
***************
*** 141,146 ****
              warning += list;
  
!          warning += ": " + e.getMessage() + " at " + context.getCurrentLocation();
!          context.getLog("engine").warning(warning);
           writeWarning(warning, context, out);
           return;
--- 139,143 ----
              warning += list;
  
!          warning += ": " + e.getMessage();
           writeWarning(warning, context, out);
           return;
***************
*** 156,160 ****
           catch (PropertyException e) {
              String errorText = "#foreach: Unable to set list index";
-             context.getBroker().getLog("engine").error(errorText);
              writeWarning(errorText, context, out);
           }
--- 153,156 ----

Index: IfDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IfDirective.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IfDirective.java	1 Nov 2002 22:15:31 -0000	1.13
--- IfDirective.java	11 Nov 2002 04:26:12 -0000	1.14
***************
*** 192,197 ****
           }
           catch (Exception e) {
!             String warning = "#if: Error evaluating condition: " + e + " at " + context.getCurrentLocation();
!             context.getLog("engine").warning(warning);
              writeWarning(warning, context, out);
           }
--- 192,196 ----
           }
           catch (Exception e) {
!             String warning = "#if: Error evaluating condition: " + e;
              writeWarning(warning, context, out);
           }

Index: SetDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetDirective.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SetDirective.java	11 Jun 2002 17:43:20 -0000	1.13
--- SetDirective.java	11 Nov 2002 04:26:12 -0000	1.14
***************
*** 87,91 ****
        catch (Exception e) {
           String errorText = "#set: Unable to set value: " + target;
-          context.getBroker().getLog("engine").error(errorText);
           writeWarning(errorText, context, out);
        }
--- 87,90 ----

Index: SetblockDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetblockDirective.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SetblockDirective.java	5 Sep 2002 05:24:29 -0000	1.3
--- SetblockDirective.java	11 Nov 2002 04:26:12 -0000	1.4
***************
*** 89,93 ****
        catch (Exception e) {
           String errorText = "#setblock: Unable to set " + target;
-          context.getBroker().getLog("engine").error(errorText);
           writeWarning(errorText, context, out);
        }
--- 89,92 ----

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestCountDirective.java,NONE,1.1

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory usw-pr-cvs1:/tmp/cvs-serv9803/test/unit/org/webmacro/template

Added Files:
	TestCountDirective.java 
Log Message:
- Changed Directive.writeWarning() to always include the context.currentLocation() and to always write the warning message to a log named "directive".  Adjusted directives that use .writeWarning().

- Added a test case for #count


--- NEW FILE: TestCountDirective.java ---
/*
 * Created by IntelliJ IDEA.
 * User: e_ridge
 * Date: Nov 10, 2002
 * Time: 10:58:34 PM
 * To change template for new class use 
 * Code Style | Class Templates options (Tools | IDE Options).
 */
package org.webmacro.template;

import org.webmacro.Context;

public class TestCountDirective extends TemplateTestCase {
    public static class Counter {
        private int _cnt = 0;

        public void next() {
            _cnt++;
        }

        public int getCount() {
            return _cnt;
        }

        public String toString() {
            return _cnt+"";
        }

    }
    public TestCountDirective(String name) {
        super(name);
    }

    protected void stuffContext(Context context) throws Exception {
        _context.put ("Counter", new Counter());
    }

    public void testCountForwards () throws Exception {
        executeStringTemplate("#count $i from 1 to 10 { $Counter.next() }");
        Integer i = (Integer) _context.get("i");
        Counter c = (Counter) _context.get("Counter");
        assert (i.intValue() == c.getCount());
    }
    public void testCountBackwards () throws Exception {
        executeStringTemplate("#count $i from 10 to 1 step -1 { $Counter.next() }");
        Integer i = (Integer) _context.get("i");
        Counter c = (Counter) _context.get("Counter");
        assert (c.toString(), c.getCount() == 10);
        assert (i.toString(), i.intValue() == 1);
    }
    public void testCountByTwo () throws Exception {
        executeStringTemplate("#count $i from 1 to 10 step 2 { $Counter.next() }");
        Integer i = (Integer) _context.get("i");
        Counter c = (Counter) _context.get("Counter");
        assert (c.toString(), c.getCount() == 5);
        assert (i.toString(), i.intValue() == 9);
    }
    public void testCountByZero () throws Exception {
        executeStringTemplate("#count $i from 1 to 10 step 0 { $Counter.next() }");
        Integer i = (Integer) _context.get("i");
        Counter c = (Counter) _context.get("Counter");
        assert (c.toString(), c.getCount() == 0);
        assert (i == null);
    }
    public void testCountForwardsWithNegativeStep () throws Exception {
        executeStringTemplate("#count $i from 1 to 10 step -1 { $Counter.next() }");
        Integer i = (Integer) _context.get("i");
        Counter c = (Counter) _context.get("Counter");
        assert (c.toString(), c.getCount() == 0);
        assert (i == null);
    }
    public void testCountBackwardsWithPositiveStep () throws Exception {
        executeStringTemplate("#count $i from 10 to 1 step 1 { $Counter.next() }");
        Integer i = (Integer) _context.get("i");
        Counter c = (Counter) _context.get("Counter");
        assert (c.toString(), c.getCount() == 0);
        assert (i == null);
    }

}

[WebMacro-cvs] webmacro/distroot RELEASE-NOTES,1.11,1.12 UPGRADE,1.5,1.6

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/distroot
In directory usw-pr-cvs1:/tmp/cvs-serv910/distroot

Modified Files:
	RELEASE-NOTES UPGRADE 
Log Message:
attempting to get things in order so the 1.1b2 release will go a bit faster


Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/RELEASE-NOTES,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RELEASE-NOTES	5 Nov 2002 03:04:20 -0000	1.11
--- RELEASE-NOTES	10 Nov 2002 22:09:43 -0000	1.12
***************
*** 1,7 ****
! WebMacro 1.1b1
  ---------------
                      
! This is the fist in a series of Beta releases for WebMacro 1.1.  WM 1.1 includes
! new features such as #macro, #count, and $functions().
  
  WebMacro is alive, and this release is proof!
--- 1,7 ----
! WebMacro 1.1b2
  ---------------
                      
! This is the second in a series of Beta releases for WebMacro 1.1.  WM 1.1 includes
! new features such as #macro, #count, $functions(), and various bugfixes.
  
  WebMacro is alive, and this release is proof!
***************
*** 13,25 ****
  SourceForge (http://www.sourceforge.net/projects/webmacro/).  We hope this
  will prove to give the WebMacro community continued support.  We also hope
! it will make our lives a bit easier too!
! 
! Please note that our mailing list address has changed.  
! Visit http://www.webmacro.org/MailingList for details.
  
  
  Changes in this Release
  -----------------------
  
  - added #macro directive (brian)
  
--- 13,37 ----
  SourceForge (http://www.sourceforge.net/projects/webmacro/).  We hope this
  will prove to give the WebMacro community continued support.  We also hope
! it will make our lives a bit easier!
  
+ Note that because of the move to SourceForge our mailing list address has changed.  
+ Please visit http://www.webmacro.org/MailingList for details.
  
  Changes in this Release
  -----------------------
  
+ - more documentation concerning new features (brian, keats, lane)
+ 
+ - fixed bugs 69, 66, and 59 (eric)
+ 
+ - WMServlet.doGet() is no longer "final" (eric)
+ 
+ - logging API now accepts "Throwable"s instead of "Exception"s. (eric)
+    This one might require you to recompile your classes. 
+ 
+ 
+ Changes Prior to this Release
+ -----------------------------
+ 
  - added #macro directive (brian)
  
***************
*** 31,39 ****
  
  - moved to SourceForge (eric)
- 
- 
- 
- Changes Prior to this Release
- -----------------------------
  
  - Fixed synchronization issues with FWPool.  No more IOOB Exceptions (lane)
--- 43,46 ----

Index: UPGRADE
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/UPGRADE,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UPGRADE	22 Nov 2001 05:36:27 -0000	1.5
--- UPGRADE	10 Nov 2002 22:09:43 -0000	1.6
***************
*** 3,79 ****
  
  If you are upgrading from early versions of WebMacro, you should
! probably read this file.  If you're upgrading from 0.97 or better, 
! you can (probably) ignore all of this.  :)
! 
! 
! 1) WebMacro no longer requires a "WebMacro.properties" file (it is
! completely optional).  WebMacro now has a "WebMacro.defaults" file that
! is included in the .jar file.  This file is used as a base for WM's
! configuration.  If you find you need to change values, simply create a 
! "WebMacro.properties" file and include *only* the keys you need to change.
! WM will combine these two files to form the final configuration.
! 
! This also means you don't need to configure a TemplatePath, so long as you
! meet one of the following requirements:
! 
!    1) Using WM in standalone mode, your templates are accessible via the
!    system CLASSPATH; or
!    
!    2) Subclassing WMServlet in a Servlet 2.0 environment (Apache/JServ), 
!    your templates are available via your servlet container CLASSPATH; or
!    
!    3) Subclassing WMServlet in a Servlet 2.1+ environment (Turbine or Resin), 
!    your templates are available in your "application directory".  Depending
!    on your servlet engine, this could be your WEB-INF/ directory, or your 
!    "htdocs" directory.
! 
! However, if you don't like WM doing this for you, you can simply add a
! "TemplatePath: /path/to/templates" in your custom WebMacro.properties file.
! 
! 
! 2) If you are using WebMacro in standalone mode (ie, not subclassing
! WMServlet), you are most likely using a FastWriter.  The signatures for
! FastWriter's constructors have changed to include a Broker:
!    public FastWriter(Broker broker, OutputStream out, String encoding)
! 
! Your code can be easily adjusted by simply passing in the Broker returned
! from the getBroker() method of your WebMacro instance:
!    FastWriter fw = new FastWriter (_wm.getBroker(), System.out, "UTF8");
!     
!     
! 3) If you are sublcassing WMServlet, your handle() method most likely
! contains something like this at the end:
!       ...
!    Template t;
!    try {
!       t = getTemplate ("mytemplate.wm")   
!    } catch (NotFoundExceptoin nfe) {
!       System.err.println ("mytemplate.wm could not be found!");
!    }
!    
!    return t;
!    
! the getTemplate() method of WMServlet now throws a ResourceException, instead
! of a NotFoundException.  Simply change your catch block to catch the
! ResourceException and you'll be just fine.
! 
! 
! 4) org.webmacro.Context now implements java.util.Map.  This change, although
! it won't adversly affect how you use the Context object, will *require*
! you to recompile all your classes that use org.webmacro.Context.  Sorry
! for the inconvienence.
! 
! 5) If you are upgrading from a release several back from this release, recompile
! all your sources against the webmacro.jar. Don't assume that your old signatures
! match.  If one of your signatures is mismatched and will cause a fatal runtime
! error!
! 
! 6) #silence, #filter, #encode are disabled until further notice
! 
! 7) There are a lot of good resources on the website for documenting how
! to do the new things that are available now with WM.
  
! If you experience any problems or find any bugs, please send mail to
! web...@sp.... 
  
! EOF
--- 3,14 ----
  
  If you are upgrading from early versions of WebMacro, you should
! probably read this file. 
  
! Since WebMacro 1.0, only 1 minor API change has been made.  WebMacro's
! simple logging API has been changed to accept "Throwable"s instead of 
! "Exceptions".  This only impacts those who have implemented their own
! LogTargets.  If you have implemeted your own LogTargets, or have otherwise
! referenced the org.webmacro.Log object (either directory or indirectly), 
! you will need to recompile _your_ code base.
  
! Beyond this, no other public API changes have been made.

[WebMacro-cvs] webmacro build.xml,1.23,1.24

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv910

Modified Files:
	build.xml 
Log Message:
attempting to get things in order so the 1.1b2 release will go a bit faster


Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** build.xml	5 Nov 2002 03:04:19 -0000	1.23
--- build.xml	10 Nov 2002 22:09:42 -0000	1.24
***************
*** 6,10 ****
  <project name="WebMacro" default="compile" basedir=".">
  
!   <property name="version"        value="1.1b1" />
    <property name="app.name"       value="webmacro" />
    <property name="tmpdir"         value="tmp" />
--- 6,10 ----
  <project name="WebMacro" default="compile" basedir=".">
  
!   <property name="version"        value="1.1b2" />
    <property name="app.name"       value="webmacro" />
    <property name="tmpdir"         value="tmp" />

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TemplateTestCase.java,1.7,1.8

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory usw-pr-cvs1:/tmp/cvs-serv22960/test/unit/org/webmacro/template

Modified Files:
	TemplateTestCase.java 
Log Message:
A Test to try and duplicate bugs 63 and 67 (which appear to be similiar), based on the limited information provided by the users.

I cannot duplicate it.  Marked bugs as "WORKSFORME" and have moved on with the rest of my life.


Index: TemplateTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TemplateTestCase.java	6 Dec 2001 06:47:52 -0000	1.7
--- TemplateTestCase.java	10 Nov 2002 21:45:46 -0000	1.8
***************
*** 109,112 ****
--- 109,121 ----
  
  
+     public void assertEvalutionEquals (String eval, Object result) throws Exception {
+         String template = "#set $assertEvalutionEquals = " + eval;
+         executeStringTemplate(template);
+         if (result == null)
+             assert (_context.get("assertEvalutionEquals") == null);
+         else
+             assert (result==null ? "null" : result.toString(), result.equals(_context.get("assertEvalutionEquals")));
+     }
+ 
    /**
     * asserts that the specified template file (loaded via classpath) evaluates

[WebMacro-cvs] webmacro/test/unit/org/webmacro/engine TestStaticClasses.java,NONE,1.1

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/engine
In directory usw-pr-cvs1:/tmp/cvs-serv22960/test/unit/org/webmacro/engine

Added Files:
	TestStaticClasses.java 
Log Message:
A Test to try and duplicate bugs 63 and 67 (which appear to be similiar), based on the limited information provided by the users.

I cannot duplicate it.  Marked bugs as "WORKSFORME" and have moved on with the rest of my life.


--- NEW FILE: TestStaticClasses.java ---
/*
 * Created by IntelliJ IDEA.
 * User: e_ridge
 * Date: Nov 10, 2002
 * Time: 4:28:49 PM
 * To change template for new class use 
 * Code Style | Class Templates options (Tools | IDE Options).
 */
package org.webmacro.engine;

import junit.framework.TestCase;
import org.webmacro.template.TemplateTestCase;
import org.webmacro.Context;

public class TestStaticClasses extends TemplateTestCase {

    public static class Simple {
        public static String foo (String arg, String arg2) {
            if (arg ==  null)
                return "arg is null";
            else
                return arg;
        }
    }

    public TestStaticClasses(String s) {
        super(s);
    }

    protected void stuffContext(Context context) throws Exception {
        _context.put ("SimpleInstance", new Simple());
        _context.put ("SimpleClass", Simple.class);
    }

    public void testStaticClassWithNullAsFirstArg_1 () throws Exception {
        assertEvalutionEquals("$SimpleClass.foo(null, null)", "arg is null");
        assertEvalutionEquals("$SimpleInstance.foo(null, null)", "arg is null");
    }
    public void testStaticClassWithNullAsFirstArg_2 () throws Exception {
        executeStringTemplate("$SimpleClass.foo(null, null)");
        executeStringTemplate("$SimpleInstance.foo(null, null)");
    }
}

[WebMacro-cvs] webmacro/test/unit/org/webmacro/engine - New directory

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/engine
In directory usw-pr-cvs1:/tmp/cvs-serv22869/test/unit/org/webmacro/engine

Log Message:
Directory /cvsroot/webmacro/webmacro/test/unit/org/webmacro/engine added to the repository

[WebMacro-cvs] webmacro/test/unit/org/webmacro/util TestMathTool.java,NONE,1.1

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util
In directory usw-pr-cvs1:/tmp/cvs-serv16361/test/unit/org/webmacro/util

Added Files:
	TestMathTool.java 
Log Message:
fixing bug #59:  MathTool.random() oversteps its bounds 


--- NEW FILE: TestMathTool.java ---
/*
 * Created by IntelliJ IDEA.
 * User: e_ridge
 * Date: Nov 10, 2002
 * Time: 4:15:21 PM
 * To change template for new class use 
 * Code Style | Class Templates options (Tools | IDE Options).
 */
package org.webmacro.util;

import junit.framework.TestCase;
import org.webmacro.servlet.MathTool;

public class TestMathTool extends TestCase {
    public TestMathTool(String s) {
        super(s);
    }

    public void testRandom () {
        for (int x=0; x<1000000; x++) {
            int rnd = MathTool.random(3, 5);
            assert (""+rnd, rnd >= 3 && rnd <=5);
        }
    }
}

[WebMacro-cvs] webmacro/src/org/webmacro/servlet MathTool.java,1.4,1.5

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv16361/src/org/webmacro/servlet

Modified Files:
	MathTool.java 
Log Message:
fixing bug #59:  MathTool.random() oversteps its bounds 


Index: MathTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/MathTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MathTool.java	6 Jul 2002 03:31:09 -0000	1.4
--- MathTool.java	10 Nov 2002 21:26:54 -0000	1.5
***************
*** 99,103 ****
      */
     public static final int random(int start, int end) {
!       return start + ((int) (1000000.0 * java.lang.Math.random()) % end);
     }
  
--- 99,103 ----
      */
     public static final int random(int start, int end) {
!       return start + (int) (end *java.lang.Math.random()/(Integer.MAX_VALUE+1.0));
     }
  

[WebMacro-cvs] webmacro/test/unit/org/webmacro/util TestTextTool.java,NONE,1.1

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util
In directory usw-pr-cvs1:/tmp/cvs-serv11092/test/unit/org/webmacro/util

Added Files:
	TestTextTool.java 
Log Message:
- fixing bug #69:  TextTool.rtim() trims too much
   added a testcase for it
- added ability to run just one test:
   example: ant test -Dtest=TestTextTool



--- NEW FILE: TestTextTool.java ---
/*
 * Created by IntelliJ IDEA.
 * User: e_ridge
 * Date: Nov 10, 2002
 * Time: 4:01:31 PM
 * To change template for new class use 
 * Code Style | Class Templates options (Tools | IDE Options).
 */
package org.webmacro.util;

import junit.framework.TestCase;
import org.webmacro.servlet.TextTool;

public class TestTextTool extends TestCase {
    public TestTextTool(String s) {
        super(s);
    }

    public void testRTrim() {
        String toTrim = "This is a test     ";
        String expected = "This is a test";
        assertEquals (expected, TextTool.rtrim(toTrim));
    }
    public void testLTrim() {
        String toTrim = "      This is a test     ";
        String expected = "This is a test     ";
        assertEquals (expected, TextTool.ltrim(toTrim));
    }
}

[WebMacro-cvs] webmacro/src/org/webmacro/servlet TextTool.java,1.9,1.10

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv11092/src/org/webmacro/servlet

Modified Files:
	TextTool.java 
Log Message:
- fixing bug #69:  TextTool.rtim() trims too much
   added a testcase for it
- added ability to run just one test:
   example: ant test -Dtest=TestTextTool



Index: TextTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TextTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TextTool.java	11 Jun 2002 17:43:22 -0000	1.9
--- TextTool.java	10 Nov 2002 21:11:27 -0000	1.10
***************
*** 108,112 ****
      * the value of <code>src</code>.<p>
      *
!     * @returns String with all occurrences of <code>from</code> replaced with
      *          <code>to</code> in <code>src</code> or <code>src</code> if
      *          <code>from</code> not found
--- 108,112 ----
      * the value of <code>src</code>.<p>
      *
!     * @return String with all occurrences of <code>from</code> replaced with
      *          <code>to</code> in <code>src</code> or <code>src</code> if
      *          <code>from</code> not found
***************
*** 263,267 ****
        if (s == null) return null;
        for (int i = s.length() - 1; i > -1; i--) {
!          if (!Character.isWhitespace(s.charAt(i))) return s.substring(0, i);
        }
        // if all WS return empty string
--- 263,267 ----
        if (s == null) return null;
        for (int i = s.length() - 1; i > -1; i--) {
!          if (!Character.isWhitespace(s.charAt(i))) return s.substring(0, i+1);
        }
        // if all WS return empty string

[WebMacro-cvs] webmacro/test build.xml,1.4,1.5

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/test
In directory usw-pr-cvs1:/tmp/cvs-serv11092/test

Modified Files:
	build.xml 
Log Message:
- fixing bug #69:  TextTool.rtim() trims too much
   added a testcase for it
- added ability to run just one test:
   example: ant test -Dtest=TestTextTool



Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml	17 Jun 2001 22:57:01 -0000	1.4
--- build.xml	10 Nov 2002 21:11:27 -0000	1.5
***************
*** 4,9 ****
    <property name="unit.classes" value="${test.root}/unit-classes"/>
    <property name="unit.reports" value="${test.root}/unit-reports"/>
  
!   <taskdef name="junit" 
     classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />
  
--- 4,10 ----
    <property name="unit.classes" value="${test.root}/unit-classes"/>
    <property name="unit.reports" value="${test.root}/unit-reports"/>
+   <property name="test" value="Test*" />
  
!   <taskdef name="junit"
     classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />
  
***************
*** 47,51 ****
        <formatter type="plain" />
        <batchtest fork="yes" todir="${unit.reports}">
!         <fileset dir="${unit.root}" includes="**/Test*.java" />
        </batchtest>
      </junit>
--- 48,52 ----
        <formatter type="plain" />
        <batchtest fork="yes" todir="${unit.reports}">
!         <fileset dir="${unit.root}" includes="**/${test}.java" />
        </batchtest>
      </junit>
***************
*** 67,71 ****
        <formatter type="plain" />
        <batchtest fork="yes" todir="${unit.reports}">
!         <fileset dir="${unit.root}" includes="**/Test*.java" />
        </batchtest>
      </junit>
--- 68,72 ----
        <formatter type="plain" />
        <batchtest fork="yes" todir="${unit.reports}">
!         <fileset dir="${unit.root}" includes="**/${test}.java" />
        </batchtest>
      </junit>

[WebMacro-cvs] webmacro/src/org/webmacro/servlet Form.java,1.7,1.8

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv2144/src/org/webmacro/servlet

Modified Files:
	Form.java 
Log Message:
fixng bug #66:  implement .toString() method for Context and Form


Index: Form.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/Form.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Form.java	15 Jul 2002 22:01:20 -0000	1.7
--- Form.java	10 Nov 2002 20:51:13 -0000	1.8
***************
*** 128,131 ****
     }
  
! }
  
--- 128,147 ----
     }
  
!     /**
!      * Return a String listing all the HTTP request parameter names and their values.
!      */
!     final public String toString() {
!         StringBuffer sb = new StringBuffer ();
!         String eol = java.lang.System.getProperty ("line.separator");
!         for (Enumeration enum = _request.getParameterNames(); enum.hasMoreElements();) {
!             String key = (String) enum.nextElement();
!             String[] value = _request.getParameterValues(key);
  
+             for (int x=0; value != null && x<value.length; x++) {
+                 sb.append (key).append("=").append(value[x]).append (eol);
+             }
+         }
+         return sb.toString();
+     }
+ 
+ }
\ No newline at end of file

[WebMacro-cvs] webmacro/src/org/webmacro Context.java,1.55,1.56

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv2144/src/org/webmacro

Modified Files:
	Context.java 
Log Message:
fixng bug #66:  implement .toString() method for Context and Form


Index: Context.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Context.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Context.java	24 Jul 2002 07:20:36 -0000	1.55
--- Context.java	10 Nov 2002 20:51:12 -0000	1.56
***************
*** 742,746 ****
        _prof.stopEvent();
     }
!    
     /* Convenience methods for primitive types */
     
--- 742,754 ----
        _prof.stopEvent();
     }
! 
!     /**
!      * Dump the variables (and their values) contained in this Context.  Output is similiar to
!      * <code>java.util.HashMap.toString()</code>
!      */
!     public String toString() {
!         return _variables.toString();
!     }
! 
     /* Convenience methods for primitive types */
     

[WebMacro-cvs] webmacro/src/org/webmacro/servlet ServletLog.java,1.4,1.5 WMServlet.java,1.51,1.52

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv29126/src/org/webmacro/servlet

Modified Files:
	ServletLog.java WMServlet.java 
Log Message:
- make WMServlet.doGet() non-final
- make logging API's use Throwable instead of Exception
    You'll want to do an "ant clean" before you try to compile. 



Index: ServletLog.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ServletLog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ServletLog.java	11 Jun 2002 17:43:22 -0000	1.4
--- ServletLog.java	10 Nov 2002 20:35:08 -0000	1.5
***************
*** 59,64 ****
     private Object[] _args = new Object[4];
  
!    public void log(Date date, String name, String level, String message,
!                    Exception e) {
        synchronized (_args) {
           _args[0] = date;
--- 59,63 ----
     private Object[] _args = new Object[4];
  
!    public void log(Date date, String name, String level, String message, Throwable e) {
        synchronized (_args) {
           _args[0] = date;

Index: WMServlet.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** WMServlet.java	24 Jun 2002 23:30:26 -0000	1.51
--- WMServlet.java	10 Nov 2002 20:35:08 -0000	1.52
***************
*** 191,195 ****
      * @exception IOException if we can't write to the output stream
      */
!    final protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     throws ServletException, IOException {
        doRequest(req, resp);
--- 191,195 ----
      * @exception IOException if we can't write to the output stream
      */
!    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     throws ServletException, IOException {
        doRequest(req, resp);

[WebMacro-cvs] webmacro/src/org/webmacro/util LogFile.java,1.10,1.11 LogSource.java,1.7,1.8 LogTarget.java,1.6,1.7

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util
In directory usw-pr-cvs1:/tmp/cvs-serv29126/src/org/webmacro/util

Modified Files:
	LogFile.java LogSource.java LogTarget.java 
Log Message:
- make WMServlet.doGet() non-final
- make logging API's use Throwable instead of Exception
    You'll want to do an "ant clean" before you try to compile. 



Index: LogFile.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogFile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LogFile.java	17 Jul 2002 07:18:22 -0000	1.10
--- LogFile.java	10 Nov 2002 20:35:08 -0000	1.11
***************
*** 124,128 ****
  	}
  
! 	public void log( Date date, String name, String level, String message, Exception e ) {
  		Object[] _args = new Object[ 4 ];
  
--- 124,128 ----
  	}
  
! 	public void log( Date date, String name, String level, String message, Throwable e ) {
  		Object[] _args = new Object[ 4 ];
  
***************
*** 159,164 ****
  	}
  
! }
! 
! 
! 
--- 159,161 ----
  	}
  
! }
\ No newline at end of file

Index: LogSource.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LogSource.java	11 Jun 2002 17:43:23 -0000	1.7
--- LogSource.java	10 Nov 2002 20:35:08 -0000	1.8
***************
*** 165,169 ****
      * during development.
      */
!    public void debug(String msg, Exception e) {
        log(LogSystem.DEBUG, msg, e);
     }
--- 165,169 ----
      * during development.
      */
!    public void debug(String msg, Throwable e) {
        log(LogSystem.DEBUG, msg, e);
     }
***************
*** 202,206 ****
      * system you would expect to see only a few warnings.
      */
!    public void warning(String msg, Exception e) {
        log(LogSystem.WARNING, msg, e);
     }
--- 202,206 ----
      * system you would expect to see only a few warnings.
      */
!    public void warning(String msg, Throwable e) {
        log(LogSystem.WARNING, msg, e);
     }
***************
*** 226,230 ****
      * to see any error messages.
      */
!    public void error(String msg, Exception e) {
        log(LogSystem.ERROR, msg, e);
     }
--- 226,230 ----
      * to see any error messages.
      */
!    public void error(String msg, Throwable e) {
        log(LogSystem.ERROR, msg, e);
     }
***************
*** 247,251 ****
     }
  
!    protected void log(int level, String msg, Exception e) {
        LogTarget[] targets = _targets[level];
        if (targets == null) {
--- 247,251 ----
     }
  
!    protected void log(int level, String msg, Throwable e) {
        LogTarget[] targets = _targets[level];
        if (targets == null) {

Index: LogTarget.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogTarget.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LogTarget.java	11 Jun 2002 17:43:23 -0000	1.6
--- LogTarget.java	10 Nov 2002 20:35:08 -0000	1.7
***************
*** 36,40 ****
      * accepted.
      */
!    public void log(java.util.Date date, String type, String level, String message, Exception e);
  
     /**
--- 36,40 ----
      * accepted.
      */
!    public void log(java.util.Date date, String type, String level, String message, Throwable e);
  
     /**
***************
*** 74,78 ****
     public void removeObserver(LogSystem ls);
  
! }
! 
! 
--- 74,76 ----
     public void removeObserver(LogSystem ls);
  
! }
\ No newline at end of file

[WebMacro-cvs] webmacro/src/org/webmacro Log.java,1.6,1.7

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv29126/src/org/webmacro

Modified Files:
	Log.java 
Log Message:
- make WMServlet.doGet() non-final
- make logging API's use Throwable instead of Exception
    You'll want to do an "ant clean" before you try to compile. 



Index: Log.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Log.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Log.java	11 Jun 2002 17:43:20 -0000	1.6
--- Log.java	10 Nov 2002 20:35:08 -0000	1.7
***************
*** 38,42 ****
      * during development.
      */
!    public void debug(String msg, Exception e);
  
     /**
--- 38,42 ----
      * during development.
      */
!    public void debug(String msg, Throwable e);
  
     /**
***************
*** 67,71 ****
      * system you would expect to see only a few warnings.
      */
!    public void warning(String msg, Exception e);
  
     /**
--- 67,71 ----
      * system you would expect to see only a few warnings.
      */
!    public void warning(String msg, Throwable e);
  
     /**
***************
*** 85,89 ****
      * to see any error messages.
      */
!    public void error(String msg, Exception e);
  
     /**
--- 85,89 ----
      * to see any error messages.
      */
!    public void error(String msg, Throwable e);
  
     /**

[WebMacro-cvs] wiki/src/org/tcdi/opensource/wiki/renderer TextPageRenderer.java,1.3,1.4

[<dr...@us...>]

Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer
In directory usw-pr-cvs1:/tmp/cvs-serv23657/src/org/tcdi/opensource/wiki/renderer

Modified Files:
	TextPageRenderer.java 
Log Message:
overload ctor to not require a WikiSystem.  In TextPageRenderer it's not used anyways.


Index: TextPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/TextPageRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TextPageRenderer.java	19 Oct 2001 03:18:32 -0000	1.3
--- TextPageRenderer.java	7 Nov 2002 18:15:27 -0000	1.4
***************
*** 57,60 ****
--- 57,64 ----
      private WikiSystem _wiki;
  
+     public TextPageRenderer (WikiURLRenderer urlRenderer) {
+         this (urlRenderer, null);
+     }
+ 
      public TextPageRenderer (WikiURLRenderer urlRenderer, WikiSystem wiki) {
          super (urlRenderer);

[WebMacro-cvs] webmacro/src/org/webmacro/directive IncludeDirective.java,1.13,1.14

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv13427/src/org/webmacro/directive

Modified Files:
	IncludeDirective.java 
Log Message:
On second thought, just output a warning.   There are lots of cases where a template should be able to #include itself.


Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IncludeDirective.java	5 Nov 2002 20:58:01 -0000	1.13
--- IncludeDirective.java	5 Nov 2002 22:01:28 -0000	1.14
***************
*** 334,338 ****
         // maybe there is a better way to handle this?
         if (context.getCurrentLocation().indexOf(_strFilename) > -1) {
!            throw makePropertyException(context.getCurrentLocation() + " tried to include itself!  You can't do this.");
         }
  
--- 334,339 ----
         // maybe there is a better way to handle this?
         if (context.getCurrentLocation().indexOf(_strFilename) > -1) {
!            String warning = context.getCurrentLocation() + " includes itself.";
!            writeWarning(warning, context, out);
         }
  

[WebMacro-cvs] webmacro/src/org/webmacro/directive IncludeDirective.java,1.12,1.13

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv21173/src/org/webmacro/directive

Modified Files:
	IncludeDirective.java 
Log Message:
Add some logic to stop a template from #including itself.  Otherwise, you end up with stack overflow/out of memory exceptions (or in my case, on OS X, a "bus error" with a JVM core-dump).

Comments on a better way to handle this?


Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IncludeDirective.java	11 Jun 2002 17:43:20 -0000	1.12
--- IncludeDirective.java	5 Nov 2002 20:58:01 -0000	1.13
***************
*** 331,334 ****
--- 331,340 ----
        }
  
+        // make sure we're not trying to include ourself.
+        // maybe there is a better way to handle this?
+        if (context.getCurrentLocation().indexOf(_strFilename) > -1) {
+            throw makePropertyException(context.getCurrentLocation() + " tried to include itself!  You can't do this.");
+        }
+ 
        // this should only be true if StrictCompatibility is set to false
        // and "as <something>" wasn't specified in the arg list

[WebMacro-cvs] webmacro/distroot readme.html,1.10,1.11

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/distroot
In directory usw-pr-cvs1:/tmp/cvs-serv20775/distroot

Modified Files:
	readme.html 
Log Message:
great.  Now that I've done the release, I realize this is actually November.  duh.


Index: readme.html
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/readme.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** readme.html	5 Nov 2002 03:04:20 -0000	1.10
--- readme.html	5 Nov 2002 03:17:15 -0000	1.11
***************
*** 10,14 ****
  <h3>Manifest</h3>
  
! <li>Build Date:  04 - October - 2002
  <li>Release Number: 1.1b1
  <li>Builders: <a href="http://www.webmacro.org/BrianGoetz">Brian Goetz</a>,
--- 10,14 ----
  <h3>Manifest</h3>
  
! <li>Build Date:  04 - November - 2002
  <li>Release Number: 1.1b1
  <li>Builders: <a href="http://www.webmacro.org/BrianGoetz">Brian Goetz</a>,

[WebMacro-cvs] webmacro/distroot CREDITS,1.1,1.2 RELEASE-NOTES,1.10,1.11 readme.html,1.9,1.10

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/distroot
In directory usw-pr-cvs1:/tmp/cvs-serv16868/distroot

Modified Files:
	CREDITS RELEASE-NOTES readme.html 
Log Message:
preparing for the 1.1b1 release.


Index: CREDITS
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/CREDITS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CREDITS	18 Jun 2001 03:43:11 -0000	1.1
--- CREDITS	5 Nov 2002 03:04:20 -0000	1.2
***************
*** 1,4 ****
  
! (c) 1998, 1999, 2000, 2001 by Semiotek Inc. and its contributors. 
  
  WebMacro was primarily designed and developed by Justin Wells, 
--- 1,4 ----
  
! (c) 1998, 1999, 2000, 2001, 2002 by Semiotek Inc. and its contributors. 
  
  WebMacro was primarily designed and developed by Justin Wells, 

Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/RELEASE-NOTES,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RELEASE-NOTES	1 Dec 2001 22:07:28 -0000	1.10
--- RELEASE-NOTES	5 Nov 2002 03:04:20 -0000	1.11
***************
*** 1,26 ****
! WebMacro 1.0rc3
  ---------------
                      
! This is the third 1.0 release candidate.  We've worked hard to get here, and
! we hope WebMacro will (continue to) work hard for you.
  
! Should you encounter problems with this release, please submit a bug report
! to http://www.webmacro.org/bugzilla/.
  
! As always, see http://www.webmacro.org for complete documentation.
  
- Unless there are some serious problems found, this will be the last release
- candidate prior to release 1. 
  
  Changes in this Release
  -----------------------
  
! - Fixed synchronization issues with FWPool.  No more IOOB Exceptions (lane)
  
- - Fixed "characters get dropped" when parsing templates (brian)
  
  
  Changes Prior to this Release
  -----------------------------
  
  - More encoding tests.  TestWindows1251Encoding and TestISO88591Encoding
--- 1,43 ----
! WebMacro 1.1b1
  ---------------
                      
! This is the fist in a series of Beta releases for WebMacro 1.1.  WM 1.1 includes
! new features such as #macro, #count, and $functions().
  
! WebMacro is alive, and this release is proof!
  
! The best place for information about WebMacro is our website:
!     http://www.webmacro.org/
! 
! In addition, WebMacro has relocated the management aspects of the project to
! SourceForge (http://www.sourceforge.net/projects/webmacro/).  We hope this
! will prove to give the WebMacro community continued support.  We also hope
! it will make our lives a bit easier too!
! 
! Please note that our mailing list address has changed.  
! Visit http://www.webmacro.org/MailingList for details.
  
  
  Changes in this Release
  -----------------------
  
! - added #macro directive (brian)
! 
! - added #count directive (eric)
! 
! - added $functions() (keats)
! 
! - cleanup some error messages (eric)
! 
! - moved to SourceForge (eric)
  
  
  
  Changes Prior to this Release
  -----------------------------
+ 
+ - Fixed synchronization issues with FWPool.  No more IOOB Exceptions (lane)
+ 
+ - Fixed "characters get dropped" when parsing templates (brian)
  
  - More encoding tests.  TestWindows1251Encoding and TestISO88591Encoding

Index: readme.html
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/readme.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** readme.html	1 Dec 2001 22:07:28 -0000	1.9
--- readme.html	5 Nov 2002 03:04:20 -0000	1.10
***************
*** 10,15 ****
  <h3>Manifest</h3>
  
! <li>Build Date:  08 - November - 2001
! <li>Release Number: 1.0rc3
  <li>Builders: <a href="http://www.webmacro.org/BrianGoetz">Brian Goetz</a>,
                <a href="http://www.webmacro.org/EricRidge">Eric Ridge</a>,
--- 10,15 ----
  <h3>Manifest</h3>
  
! <li>Build Date:  04 - October - 2002
! <li>Release Number: 1.1b1
  <li>Builders: <a href="http://www.webmacro.org/BrianGoetz">Brian Goetz</a>,
                <a href="http://www.webmacro.org/EricRidge">Eric Ridge</a>,
***************
*** 19,39 ****
  <b>Abstract: Why was this release released?</b>
  <p>
! This is the third 1.0 release candidate.  This means you should find this 
! release of Webmacro to be very stable, and of production quality.
! We are not calling it a 1.0 final release until a majority of our 
! user base has had a chance to really test it. Release Candidate 1
! was released around the first of October and is exceptionally stable.
  
! A few improvements have been made for this release, RC3. They are documented
! in the release notes and other relevant release documents to help you with WM. 
! WM is a very stable platform with several years of development and testing 
! under its belt.
  
  Should you encounter problems/bugs, you should submit a bug report to
  http://www.webmacro.org/bugzilla/
- 
- <p>
- Generally, there are no new "features" going in to 
- WM.  Until 1.0final, we are in a bug-fix only mode.<p>
  
  WM is easy to use once you get the hang of it. If you are first time user, this release
--- 19,30 ----
  <b>Abstract: Why was this release released?</b>
  <p>
! This is the first in a series of Beta releases to give the WebMacro 
! community a chance to test, use, and otherwise play with new features
! that have been sitting in CVS for about a year.
  
! WebMacro is alive, and this release is proof!
  
  Should you encounter problems/bugs, you should submit a bug report to
  http://www.webmacro.org/bugzilla/
  
  WM is easy to use once you get the hang of it. If you are first time user, this release

[WebMacro-cvs] webmacro build.xml,1.22,1.23

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv16868

Modified Files:
	build.xml 
Log Message:
preparing for the 1.1b1 release.


Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** build.xml	14 Feb 2002 23:35:47 -0000	1.22
--- build.xml	5 Nov 2002 03:04:19 -0000	1.23
***************
*** 6,10 ****
  <project name="WebMacro" default="compile" basedir=".">
  
!   <property name="version"        value="1.1" />
    <property name="app.name"       value="webmacro" />
    <property name="tmpdir"         value="tmp" />
--- 6,10 ----
  <project name="WebMacro" default="compile" basedir=".">
  
!   <property name="version"        value="1.1b1" />
    <property name="app.name"       value="webmacro" />
    <property name="tmpdir"         value="tmp" />

[WebMacro-cvs] webmacro/src/org/webmacro/directive IfDirective.java,1.12,1.13

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv8979

Modified Files:
	IfDirective.java 
Log Message:
when #if outputs errors (like Objects not comparable), make sure to include the context.currentLocation();


Index: IfDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IfDirective.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IfDirective.java	11 Jun 2002 17:43:20 -0000	1.12
--- IfDirective.java	1 Nov 2002 22:15:31 -0000	1.13
***************
*** 192,196 ****
           }
           catch (Exception e) {
!             String warning = "#if: Error evaluating condition: " + e;
              context.getLog("engine").warning(warning);
              writeWarning(warning, context, out);
--- 192,196 ----
           }
           catch (Exception e) {
!             String warning = "#if: Error evaluating condition: " + e + " at " + context.getCurrentLocation();
              context.getLog("engine").warning(warning);
              writeWarning(warning, context, out);