Menu
▾
▴
webmacro-cvs — receive cvs commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(97) |
Dec
(35) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(12) |
Feb
(55) |
Mar
(21) |
Apr
(3) |
May
(7) |
Jun
(25) |
Jul
(108) |
Aug
(23) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
(6) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(13) |
Feb
|
Mar
(257) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(38) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(63) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lan...@us...> - 2002-11-17 16:26:24
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util
In directory usw-pr-cvs1:/tmp/cvs-serv32240/src/org/webmacro/util
Added Files:
SparseProperties.java
Log Message:
1.1b2 updates, additions, documentation
--- NEW FILE: SparseProperties.java ---
/*
* Copyright Open Doors Software. 1996-2002.
*
* Software is provided according to the MPL license.
* Open Doors Software provides this
* software on an as-is basis and make no representation as
* to fitness for a specific purpose.
*
* Direct all questions and comments to su...@op...
*/
package org.webmacro.util;
import java.util.Properties;
/**
* Implement a behavior allowing for undefined properties to return
* a useful default value such as "" for a string, "0.00" for
* numeric properties, and so forth.
* <p>
* A specific default can always be used as is done for string properties in the
* base class.
*/
public class SparseProperties extends Properties {
/** The global default value for all requests is "" */
protected Object globalDefault = new String("");
public SparseProperties() {super(); }
public SparseProperties(Properties defaults) { super(defaults); }
public SparseProperties(Object globalDefault) {
super();
this.globalDefault = globalDefault;
}
public SparseProperties(Properties defaults, Object globalDefault) {
super(defaults);
this.globalDefault = globalDefault;
}
/**
* Gets the object but returns the default value if not present.
*/
public Object get(Object key) {
Object o = super.get(key);
return (o == null) ? globalDefault : o;
}
/**
* Gets the object but returns the default value if not present.
*/
public Object get(Object key, Object defaultValue) {
Object o = super.get(key);
return (o == null) ? defaultValue : o;
}
}
|
|
From: <lan...@us...> - 2002-11-17 16:26:24
|
Update of /cvsroot/webmacro/webmacro/distroot In directory usw-pr-cvs1:/tmp/cvs-serv32240/distroot Modified Files: readme.html Log Message: 1.1b2 updates, additions, documentation Index: readme.html =================================================================== RCS file: /cvsroot/webmacro/webmacro/distroot/readme.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** readme.html 15 Nov 2002 00:24:12 -0000 1.12 --- readme.html 17 Nov 2002 16:26:21 -0000 1.13 *************** *** 1,108 **** <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> ! <HTML> ! <HEAD> ! <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252"> ! <TITLE></TITLE> ! <META NAME="GENERATOR" CONTENT="StarOffice 6.0 (Win32)"> ! <META NAME="CREATED" CONTENT="20021105;18094998"> ! <META NAME="CHANGEDBY" CONTENT="Lane Sharman"> ! <META NAME="CHANGED" CONTENT="20021105;18145718"> ! </HEAD> ! <BODY LANG="en-US" BGCOLOR="#ffffff"> ! <P>Thak you for downloading WebMacro. The latest release can always ! be found <A HREF="http://www.webmacro.org/DownloadWebMacro">on our ! website</A>. ! </P> ! <H3>Manifest</H3> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm">Build Date: 04 - November - 2002 ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm">Release Number: 1.1b1 ! </P> ! </UL> ! <UL> ! <LI><P>Builders: <A HREF="http://www.webmacro.org/BrianGoetz">Brian ! Goetz</A>, <A HREF="http://www.webmacro.org/EricRidge">Eric Ridge</A>, ! <A HREF="http://www.webmacro.org/LaneSharman">Lane Sharman</A>, ! <A HREF="http://www.webmacro.org/KeatsKirsch">Keats Kirsch</A> ! </P> ! </UL> ! <P><B>Abstract: Why a 1.1 Release?</B> ! </P> ! <P>In the spirit of the season, there are several important ! contributions since 1.0. It is the time to place these in a formal ! release. 1.1b is a release candidate leading to 1.1 within a few ! weeks.</P> ! <P>This is the first in a series of Beta releases to give the ! WebMacro community a chance to test, use, and start working with new ! features that have been sitting in CVS for nearly a year. ! </P> ! <P>WebMacro is a stable product and the ancestor of many templating ! projects on the net. This release proves it is a vital part of the ! templating and text rendering platforms. Should you encounter ! problems/bugs, you should submit a bug report to ! <A HREF="http://www.webmacro.org/bugzilla/">http://www.webmacro.org/bugzilla/.</A> ! </P> ! <P>WM is easy to use once you get the hang of it. If you are first ! time user, this release will not be hard to get working. If you've ! been using release 0.97+, you can pretty much replace your ! webmacro.jar with the one in this release. ! </P> ! <P>For complete information on WebMacro, this release, and usage ! questions, please visit the WebMacro Wiki at <A HREF="http://www.webmacro.org/">http://www.webmacro.org</A>.</P> ! <H3>Files, Resources, and Local Content</H3> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="LICENSE">License ! information</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="UPGRADE">Notes on ! upgrading from previous releases</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="setup.html">setup guide</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="tutorial/index.html">WebMacro ! Tutorial</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="examples/index.html">Examples</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="CONFIGURING-EXAMPLES">Notes ! on configuring examples</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="api/index.html">API ! Documentation</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="examples/WebMacro.properties">Example ! WebMacro.properties</A> ! </P> ! </UL> ! <UL> ! <LI><P><A HREF="webmacro-src.jar">WebMacro sources in .jar format</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="POLICY">Development ! Policy</A> ! </P> ! </UL> ! <UL> ! <LI><P><A HREF="CREDITS">Credits</A> ! </P> ! </UL> ! </BODY> ! </HTML> \ No newline at end of file --- 1,176 ---- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> ! <html> ! <head> ! ! <meta http-equiv="CONTENT-TYPE" ! content="text/html; charset=windows-1252"> ! <title>WebMacro Distriibution readme.html</title> ! ! <meta name="GENERATOR" content="StarOffice 6.0 (Win32)"> ! ! <meta name="CREATED" content="20021105;18094998"> ! ! <meta name="CHANGEDBY" content="Lane Sharman"> ! ! <meta name="CHANGED" content="20021105;18145718"> ! </head> ! <body lang="en-US" bgcolor="#ffffff"> ! ! <p>Thak you for downloading WebMacro. The latest release can always be found ! <a href="http://www.webmacro.org/DownloadWebMacro">on our website</a>. </p> ! ! <h3>Manifest</h3> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;">Build Date: 20 - November - 2002 </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;">Release Number: 1.1b2</p> ! </li> ! </ul> ! <ul> ! <li>Key, New 1.1 Release Features:</li> ! <ul> ! <li>macro directive allows defining "callable" functions. See <a ! href="http://www.webmacro.org/MacroDirective">http://www.webmacro.org/MacroDirective</a> ! for the docs. See macros/ in this distribution for "standard" wm macros. ! Read macros/README. Browse examples/macros for some example files.</li> ! <li>Standard WM Function Library. In a webmacro script, you now have ! standard functions which can be referenced as in #set $validURL = $HTMLEscape($Form.url). ! See http://www.webmacro.org/ for comlpete documentation.</li> ! <li>Some notable class file additions in addition to the existing API ! wealth index:</li> ! <ul> ! <li>o.w.u.SparseProperties. Extends j.u.properties such every get(key) ! and getProperty(key) has a default and the default value of the default is ! "". This makes it an ideal backing store for showing properties in a wm template ! which may be null and you want to avoid null testing. </li> ! <li>o.w.u.WMEval. A decorator for a WM instance with lifecycle management ! of the WM context.</li> ! </ul> ! </ul> ! <ul> ! <li>Internal improvements, documentation, testing, bug fixes including ! a delegating template provider.<br> ! </li> ! </ul> ! </ul> ! <ul> ! <li> ! <p>Builders: <a href="http://www.webmacro.org/BrianGoetz">Brian Goetz</a>, ! <a href="http://www.webmacro.org/EricRidge">Eric Ridge</a>, <a ! href="http://www.webmacro.org/LaneSharman">Lane Sharman</a>, <a ! href="http://www.webmacro.org/KeatsKirsch">Keats Kirsch</a></p> ! </li> ! </ul> ! ! <p><b>Abstract: Why a 1.1 Release?</b> </p> ! ! <p>In the spirit of the season, there are several important contributions ! since 1.0. It is the time to place these in a formal release. 1.1bx is a ! release candidate leading to 1.1 within a few weeks.</p> ! ! <p>This is the first in a series of Beta releases to give the WebMacro community ! a chance to test, use, and start working with new features that have been ! sitting in CVS for nearly a year. </p> ! ! <p>WebMacro is a stable product and the ancestor of many templating projects ! on the net. This release proves it is a vital part of the templating and ! text rendering platforms. Should you encounter problems/bugs, you should ! submit a bug report to <a href="http://www.webmacro.org/bugzilla/">http://www.webmacro.org/bugzilla/.</a> ! </p> ! ! <p>WM is easy to use once you get the hang of it. If you are first time user, ! this release will not be hard to get working. If you've been using release ! 0.97+, you can pretty much replace your webmacro.jar with the one in this ! release. </p> ! ! <p>For complete information on WebMacro, this release, and usage questions, ! please visit the WebMacro Wiki at <a href="http://www.webmacro.org/">http://www.webmacro.org</a>.</p> ! ! <h3>Files, Resources, and Local Content</h3> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="LICENSE">License information</a> ! </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="UPGRADE">Notes on upgrading ! from previous releases</a> </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="setup.html">setup guide</a> </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="tutorial/index.html">WebMacro ! Tutorial</a> <br> ! <br> ! </p> ! </li> ! <li> ! <p style="margin-bottom: 0cm;"><a href="examples/index.html">Examples<br> ! <br> ! </a></p> ! </li> ! <li> ! <p style="margin-bottom: 0cm;"><a href="macros/readme.html">Macros<br> ! </a> </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="CONFIGURING-EXAMPLES">Notes on ! configuring examples</a> </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="api/index.html">API Documentation</a> ! </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a ! href="examples/WebMacro.properties">Example WebMacro.properties</a> </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p><a href="webmacro-src.jar">WebMacro sources in .jar format</a> </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p style="margin-bottom: 0cm;"><a href="POLICY">Development Policy</a> ! </p> ! </li> ! </ul> ! ! <ul> ! <li> ! <p><a href="CREDITS">Credits</a> </p> ! </li> ! </ul> ! <br> ! </body> ! </html> |
|
From: <lan...@us...> - 2002-11-17 16:26:24
|
Update of /cvsroot/webmacro/webmacro/macros
In directory usw-pr-cvs1:/tmp/cvs-serv32240/macros
Added Files:
allmacros.wmm readme.html
Log Message:
1.1b2 updates, additions, documentation
--- NEW FILE: allmacros.wmm ---
#comment {
allmacros.wmm
Includes all wm macros in all subdirectories where all.wmm is defined.
}
#include as macro "sandbox/all.wmm"
#include as macro "ecomm/all.wmm"
--- NEW FILE: readme.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>WebMacro Macros readme.html</title>
<meta http-equiv="content-type"
content="text/html; charset=ISO-8859-1">
</head>
<body>
<div align="center"><b>WebMacro Standard Macro Library</b><br>
</div>
<b><br>
</b>
<blockquote><b>Goal:</b> The goal of macros/ is to provide some standardized
manner for everyday tasks like merging common html text with common objects,
formatting html form control tags, and managing common page elements.<br>
<br>
See <a href="http://www.webmacro.org/MacroDirective">http://www.webmacro.org/MacroDirective</a>
for the complete docs on how to create a macro.<br>
<br>
If macros/ is in your classpath, the following statement:<br>
<br>
#include as macro "allmacros.wmm"<br>
<br>
will include all standard macros in the macros/ folder. Edit this file if
you want to make some of your own macros a standard.<br>
<br>
<ul>
<li>wmm is the convention for identifying a file containing macros.</li>
<li>You do not have to use this library and you can copy it to another
location and hack it as you please.</li>
<li>You can add your own folder, eg local/, and then include the macros
in this folder by editing allmacros.wmm.</li>
</ul>
<br>
macros are used in 1.1. Release 1.2 will allow for automatic inclusion at
the configuration level.</blockquote>
</body>
</html>
|
|
From: <lan...@us...> - 2002-11-17 16:26:24
|
Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv32240
Modified Files:
LICENSE WebMacro.defaults build.xml
Log Message:
1.1b2 updates, additions, documentation
Index: LICENSE
===================================================================
RCS file: /cvsroot/webmacro/webmacro/LICENSE,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LICENSE 18 Jun 2001 03:44:32 -0000 1.1
--- LICENSE 17 Nov 2002 16:26:21 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
--- 1,4 ----
/*
! * Copyright (C) 1998-2002 Semiotek Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: WebMacro.defaults
===================================================================
RCS file: /cvsroot/webmacro/webmacro/WebMacro.defaults,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** WebMacro.defaults 22 Oct 2002 15:23:16 -0000 1.32
--- WebMacro.defaults 17 Nov 2002 16:26:21 -0000 1.33
***************
*** 217,220 ****
--- 217,221 ----
# Directives.escape: org.webmacro.directive.EscapeDirective
# Directives.silence: org.webmacro.directive.SilenceDirective
+ Directives.bean: org.webmacro.directive.BeanDirective
***************
*** 242,248 ****
# that are assumed to be templates when
# #include is used without qualifing the
! # file type
! include.TemplateExtensions: .wm, .wmt, .tml
! parse.TemplateExtensions: .wm, .wmt, .tml
--- 243,249 ----
# that are assumed to be templates when
# #include is used without qualifing the
! # file type. By convention wmm is for WM macro library files.
! include.TemplateExtensions: .wm, .wmt, .tml, .wmm
! parse.TemplateExtensions: .wm, .wmt, .tml, .wmm
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** build.xml 15 Nov 2002 01:15:22 -0000 1.27
--- build.xml 17 Nov 2002 16:26:21 -0000 1.28
***************
*** 10,13 ****
--- 10,14 ----
<property name="tmpdir" value="tmp" />
<property name="classes" value="classes"/>
+ <property name="macros" value="macros"/>
<property name="dist" value="webmacro-${version}"/>
<property name="javadoc" value="javadoc"/>
***************
*** 26,29 ****
--- 27,31 ----
</fileset>
<pathelement location="${classes}" />
+ <pathelement location="${macros}" />
<pathelement path="${java.class.path}" />
</path>
***************
*** 122,125 ****
--- 124,131 ----
<fileset dir="examples" />
</copy>
+ <mkdir dir="${dist}/macros" />
+ <copy todir="${dist}/macros">
+ <fileset dir="${macros}" />
+ </copy>
<!-- don't put contrib in the distro anymore.
<mkdir dir="${dist}/contrib" />
***************
*** 165,168 ****
--- 171,180 ----
<target name="test-tst" depends="compile" >
<ant antfile="test/build.xml" target="TST" >
+ <property name="java.class.path" value="${classpath.resolved}"/>
+ </ant>
+ </target>
+
+ <target name="test-macro" depends="compile" >
+ <ant antfile="test/build.xml" target="macros" >
<property name="java.class.path" value="${classpath.resolved}"/>
</ant>
|
|
From: <lan...@us...> - 2002-11-17 16:17:55
|
Update of /cvsroot/webmacro/webmacro/macros/ecomm In directory usw-pr-cvs1:/tmp/cvs-serv24468/ecomm Log Message: Directory /cvsroot/webmacro/webmacro/macros/ecomm added to the repository |
|
From: <lan...@us...> - 2002-11-17 16:17:10
|
Update of /cvsroot/webmacro/webmacro/macros In directory usw-pr-cvs1:/tmp/cvs-serv24197/macros Log Message: Directory /cvsroot/webmacro/webmacro/macros added to the repository |
|
From: <dr...@us...> - 2002-11-16 20:07:46
|
Update of /cvsroot/webmacro/webmacro/distroot
In directory usw-pr-cvs1:/tmp/cvs-serv9183
Modified Files:
RELEASE-NOTES
Log Message:
update release notes to include the syntax change to #default
Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/RELEASE-NOTES,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RELEASE-NOTES 10 Nov 2002 22:09:43 -0000 1.12
--- RELEASE-NOTES 16 Nov 2002 20:07:43 -0000 1.13
***************
*** 30,33 ****
--- 30,35 ----
This one might require you to recompile your classes.
+ - the syntax for #default has changed to:
+ #default $x = 3
Changes Prior to this Release
|
|
From: <lan...@us...> - 2002-11-15 23:46:18
|
Update of /cvsroot/webmacro/webmacro/lib In directory usw-pr-cvs1:/tmp/cvs-serv20671 Added Files: junit_37.jar Log Message: upgrade of junit --- NEW FILE: junit_37.jar --- (This appears to be a binary file; contents omitted.) |
|
From: <lan...@us...> - 2002-11-15 23:37:50
|
Update of /cvsroot/webmacro/webmacro/lib In directory usw-pr-cvs1:/tmp/cvs-serv18442 Removed Files: junit_35.jar Log Message: junit version upgrade` A iCVS: ---------------------------------------------------------------------- --- junit_35.jar DELETED --- |
|
From: <lan...@us...> - 2002-11-15 08:16:31
|
Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv21803
Modified Files:
build.xml
Log Message:
update for resin alternate example
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** build.xml 11 Nov 2002 05:05:29 -0000 1.26
--- build.xml 15 Nov 2002 01:15:22 -0000 1.27
***************
*** 12,15 ****
--- 12,16 ----
<property name="dist" value="webmacro-${version}"/>
<property name="javadoc" value="javadoc"/>
+ <property name="examples" value="examples"/>
<property name="jar" value="${app.name}.jar"/>
<property name="src.jar" value="${app.name}-src.jar"/>
***************
*** 33,36 ****
--- 34,42 ----
<mkdir dir="${javadoc}"/>
<mkdir dir="${dist}"/>
+ <mkdir dir="${examples}/WEB-INF"/>
+ <mkdir dir="${examples}/WEB-INF/classes"/>
+ <mkdir dir="${examples}/WEB-INF/lib"/>
+ <mkdir dir="${dist}"/>
+ <mkdir dir="${dist}"/>
<available property="javacc.present" classname="COM.sun.labs.javacc.Main"
classpath="${javacc.home}/JavaCC.zip" />
***************
*** 45,48 ****
--- 51,56 ----
<delete file="${src.jar}"/>
<delete dir="${tmpdir}"/>
+ <delete dir="${examples}/WEB-INF"/>
+ <delete dir="${tmpdir}"/>
</target>
***************
*** 70,73 ****
--- 78,90 ----
</target>
+ <target name="compile-examples" depends="compile">
+ <filter token="VERSION" value="${version}" />
+ <javac srcdir="${examples}" destdir="${examples}/WEB-INF/classes"
+ excludes="**/advanced/*.java"
+ debug="on" optimize="off" deprecation="off">
+ <classpath refid="class.path" />
+ </javac>
+ </target>
+
***************
*** 87,91 ****
</target>
! <target name="dist" depends="prepare,compile,jar,javadoc">
<mkdir dir="${dist}/tutorial" />
<copy todir="${dist}/tutorial">
--- 104,108 ----
</target>
! <target name="dist" depends="prepare,compile,compile-examples,jar,javadoc">
<mkdir dir="${dist}/tutorial" />
<copy todir="${dist}/tutorial">
|
|
From: <lan...@us...> - 2002-11-15 08:13:08
|
Update of /cvsroot/webmacro/webmacro/distroot In directory usw-pr-cvs1:/tmp/cvs-serv2153/webmacro/distroot Modified Files: readme.html setup.html Log Message: updates for 1.1 Index: readme.html =================================================================== RCS file: /cvsroot/webmacro/webmacro/distroot/readme.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** readme.html 5 Nov 2002 03:17:15 -0000 1.11 --- readme.html 15 Nov 2002 00:24:12 -0000 1.12 *************** *** 1,54 **** ! <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> ! <html> ! <head> ! </head> ! <body bgcolor="white"> ! ! Thak you for downloading WebMacro. The latest release can always be found ! <a href="http://www.webmacro.org/DownloadWebMacro">on our website</a>. ! ! <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>, ! <a href="http://www.webmacro.org/EricRidge">Eric Ridge</a>, ! <a href="http://www.webmacro.org/LaneSharman">Lane Sharman</a>, ! <a href="http://www.webmacro.org/KeatsKirsch">Keats Kirsch</a> ! <p> ! <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 ! will not be hard to get working. If you've been using release 0.97+, you can pretty ! much replace your webmacro.jar with the one in this release. ! ! <p> ! For complete information on WebMacro, this release, and usage questions, please ! visit the WebMacro Wiki at <a href="http://www.webmacro.org/">http://www.webmacro.org</a>.<p> ! ! <h3>Files, Resources, and Local Content</h3> ! ! <li><A href="LICENSE" >License information</a> ! <li><A href="UPGRADE" >Notes on upgrading from previous releases</a> ! <li><A href="setup.html" >setup guide</a> ! <li><A href="tutorial/index.html" >WebMacro Tutorial</a> ! <li><A href="examples/index.html" >Examples</a> ! <li><A href="CONFIGURING-EXAMPLES" >Notes on configuring examples</a> ! <li><A href="api/index.html" >API Documentation</a> ! <li><A href="examples/WebMacro.properties" >Example WebMacro.properties</a> ! <li><A href="webmacro-src.jar" >WebMacro sources in .jar format</a> ! <p></p> ! <li><A href="POLICY" >Development Policy</a> ! <li><A href="CREDITS" >Credits</a></li> ! ! </body> ! </html> --- 1,108 ---- ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> ! <HTML> ! <HEAD> ! <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252"> ! <TITLE></TITLE> ! <META NAME="GENERATOR" CONTENT="StarOffice 6.0 (Win32)"> ! <META NAME="CREATED" CONTENT="20021105;18094998"> ! <META NAME="CHANGEDBY" CONTENT="Lane Sharman"> ! <META NAME="CHANGED" CONTENT="20021105;18145718"> ! </HEAD> ! <BODY LANG="en-US" BGCOLOR="#ffffff"> ! <P>Thak you for downloading WebMacro. The latest release can always ! be found <A HREF="http://www.webmacro.org/DownloadWebMacro">on our ! website</A>. ! </P> ! <H3>Manifest</H3> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm">Build Date: 04 - November - 2002 ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm">Release Number: 1.1b1 ! </P> ! </UL> ! <UL> ! <LI><P>Builders: <A HREF="http://www.webmacro.org/BrianGoetz">Brian ! Goetz</A>, <A HREF="http://www.webmacro.org/EricRidge">Eric Ridge</A>, ! <A HREF="http://www.webmacro.org/LaneSharman">Lane Sharman</A>, ! <A HREF="http://www.webmacro.org/KeatsKirsch">Keats Kirsch</A> ! </P> ! </UL> ! <P><B>Abstract: Why a 1.1 Release?</B> ! </P> ! <P>In the spirit of the season, there are several important ! contributions since 1.0. It is the time to place these in a formal ! release. 1.1b is a release candidate leading to 1.1 within a few ! weeks.</P> ! <P>This is the first in a series of Beta releases to give the ! WebMacro community a chance to test, use, and start working with new ! features that have been sitting in CVS for nearly a year. ! </P> ! <P>WebMacro is a stable product and the ancestor of many templating ! projects on the net. This release proves it is a vital part of the ! templating and text rendering platforms. Should you encounter ! problems/bugs, you should submit a bug report to ! <A HREF="http://www.webmacro.org/bugzilla/">http://www.webmacro.org/bugzilla/.</A> ! </P> ! <P>WM is easy to use once you get the hang of it. If you are first ! time user, this release will not be hard to get working. If you've ! been using release 0.97+, you can pretty much replace your ! webmacro.jar with the one in this release. ! </P> ! <P>For complete information on WebMacro, this release, and usage ! questions, please visit the WebMacro Wiki at <A HREF="http://www.webmacro.org/">http://www.webmacro.org</A>.</P> ! <H3>Files, Resources, and Local Content</H3> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="LICENSE">License ! information</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="UPGRADE">Notes on ! upgrading from previous releases</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="setup.html">setup guide</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="tutorial/index.html">WebMacro ! Tutorial</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="examples/index.html">Examples</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="CONFIGURING-EXAMPLES">Notes ! on configuring examples</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="api/index.html">API ! Documentation</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="examples/WebMacro.properties">Example ! WebMacro.properties</A> ! </P> ! </UL> ! <UL> ! <LI><P><A HREF="webmacro-src.jar">WebMacro sources in .jar format</A> ! </P> ! </UL> ! <UL> ! <LI><P STYLE="margin-bottom: 0cm"><A HREF="POLICY">Development ! Policy</A> ! </P> ! </UL> ! <UL> ! <LI><P><A HREF="CREDITS">Credits</A> ! </P> ! </UL> ! </BODY> ! </HTML> \ No newline at end of file Index: setup.html =================================================================== RCS file: /cvsroot/webmacro/webmacro/distroot/setup.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** setup.html 30 Oct 2001 07:44:58 -0000 1.4 --- setup.html 15 Nov 2002 00:24:12 -0000 1.5 *************** *** 8,12 **** <b>Set Up Guidelines <br> ! Updated For Release 1.0rc2</b></center> <p> --- 8,12 ---- <b>Set Up Guidelines <br> ! Updated For Release 1.1</b></center> <p> |
|
From: <lan...@us...> - 2002-11-15 08:13:08
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory usw-pr-cvs1:/tmp/cvs-serv2153/webmacro/src/org/webmacro/util Modified Files: WMEval.java Log Message: updates for 1.1 Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/WMEval.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WMEval.java 11 Nov 2002 19:22:39 -0000 1.9 --- WMEval.java 15 Nov 2002 00:24:13 -0000 1.10 *************** *** 24,32 **** import java.io.*; ! import org.webmacro.*; import org.webmacro.engine.StreamTemplate; /** * WMEval encapsulates an instance of WebMacro for reuse in any java application. --- 24,34 ---- import java.io.*; ! import javax.servlet.http.*; ! import javax.servlet.ServletException; import org.webmacro.*; import org.webmacro.engine.StreamTemplate; + /** * WMEval encapsulates an instance of WebMacro for reuse in any java application. *************** *** 65,68 **** --- 67,71 ---- private OutputStream out = System.out; private Context context; + private boolean useWebContext = false; /** * If an output file is not specified as an argument, it *************** *** 75,88 **** * The constructor which creates the environment for evaluating a rule. */ ! public WMEval() { // Build a web macro environment for rule execution. try { ! wm = new WM(); context = wm.getContext(); } catch (Exception e) { ! e.printStackTrace(); } } --- 78,96 ---- * The constructor which creates the environment for evaluating a rule. */ ! public WMEval(HttpServlet servlet) { // Build a web macro environment for rule execution. try { ! wm = new WM(servlet); context = wm.getContext(); } catch (Exception e) { ! e.printStackTrace(System.err); ! throw new IllegalStateException(e.toString()); } } + + public WMEval() { + this(null); + } *************** *** 110,113 **** --- 118,125 ---- return rule; } + + public void error(String msg, Exception e) { + wm.getLog("ERROR").error(msg, e); + } /** *************** *** 212,215 **** --- 224,279 ---- rule.write(w, context); w.flush(); + } + + /** + * Evaluates the string template against the current context + * and returns the value. If an output file is specified, the value + * is written out as well. + * @param templateName The name of the template. + * @param output An optional output. + * @return The output from the evaluated template + */ + public String eval(String templateName, OutputStream out) throws Exception { + Template t = wm.getTemplate(templateName); + String val = t.evaluate(context).toString(); + if (out != null) { + out.write(val.getBytes()); + } + return val; + } + + /** + * Evaluates the string template against a new context and writes + * it to the http Response output stream using the proper encoding. + * <p> + * This is an exceptionally useful method for a servlet to use to + * write out a template. + * <p> + * <b>Note:</b> This method places "FastWriter" in the context + * so you can write out to the stream. + * @param templateName The name of the template. + * @param response The servlet response object and its output stream + * @return The output from the evaluated template + */ + public void eval(String templateName, HttpServletRequest req, + HttpServletResponse resp) throws ServletException { + try { + context = wm.getWebContext(req, resp); + String encoding = (String) wm.getConfig(WMConstants.TEMPLATE_OUTPUT_ENCODING); + if (encoding == null) { + encoding = resp.getCharacterEncoding(); + } + FastWriter w = context.getBroker().getFastWriter(out, encoding); + Template t = wm.getTemplate(templateName); + context.put("FastWriter", w); // allow template writers to access the output stream! + t.write(w, context); + resp.setContentLength(w.size()); + w.writeTo(resp.getOutputStream()); + w.flush(); + } + catch (Exception e) { + e.printStackTrace(System.err); + throw new ServletException(e.toString()); + } } |
|
From: <lan...@us...> - 2002-11-15 08:09:29
|
Update of /cvsroot/webmacro/webmacro/distroot
In directory usw-pr-cvs1:/tmp/cvs-serv23314/distroot
Modified Files:
CONFIGURING-EXAMPLES
Log Message:
Index: CONFIGURING-EXAMPLES
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/CONFIGURING-EXAMPLES,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CONFIGURING-EXAMPLES 15 Nov 2002 01:15:22 -0000 1.3
--- CONFIGURING-EXAMPLES 15 Nov 2002 01:20:34 -0000 1.4
***************
*** 76,84 ****
This technique avoids moving directories all over the place.
! Assume that you have placed webmacro/ in /usr/local/web
! and /usr/local/web is an application directory for http://localhost
1) Copy webmacro.jar to <resin_home>/lib
! 2) Add the following to your resin.conf:
<web-app id='wm' app-dir='webmacro/examples'>
<servlet-mapping url-pattern='/servlet/*' servlet-name='invoker'/>
--- 76,84 ----
This technique avoids moving directories all over the place.
! Assume that you have installed webmacro/ in /usr/local/web
! and /usr/local/web is an application root directory for http://localhost
1) Copy webmacro.jar to <resin_home>/lib
! 2) Add the following to your resin.conf within the application host section:
<web-app id='wm' app-dir='webmacro/examples'>
<servlet-mapping url-pattern='/servlet/*' servlet-name='invoker'/>
|
|
From: <lan...@us...> - 2002-11-15 07:59:22
|
Update of /cvsroot/webmacro/webmacro/distroot
In directory usw-pr-cvs1:/tmp/cvs-serv21803/distroot
Modified Files:
CONFIGURING-EXAMPLES
Log Message:
update for resin alternate example
Index: CONFIGURING-EXAMPLES
===================================================================
RCS file: /cvsroot/webmacro/webmacro/distroot/CONFIGURING-EXAMPLES,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CONFIGURING-EXAMPLES 30 Oct 2001 07:44:58 -0000 1.2
--- CONFIGURING-EXAMPLES 15 Nov 2002 01:15:22 -0000 1.3
***************
*** 71,74 ****
--- 71,92 ----
<welcome-file-list>index.html</welcome-file-list>
</web-app>
+
+ *ALTERNATIVE CONFIGURATION FOR RESIN*
+
+ This technique avoids moving directories all over the place.
+
+ Assume that you have placed webmacro/ in /usr/local/web
+ and /usr/local/web is an application directory for http://localhost
+
+ 1) Copy webmacro.jar to <resin_home>/lib
+ 2) Add the following to your resin.conf:
+ <web-app id='wm' app-dir='webmacro/examples'>
+ <servlet-mapping url-pattern='/servlet/*' servlet-name='invoker'/>
+ <welcome-file-list>index.html</welcome-file-list>
+ </web-app>
+
+ http://localhost/wm should serve up the index.html page and the links in the page
+ should serve up the servlets.
+
*NOTE ON TEMPLATE PATHS*
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine
In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/engine
Modified Files:
DebugEvaluationExceptionHandler.java IntrospectionUtils.java
MethodWrapper.java StaticClassWrapper.java VoidMacro.java
Log Message:
- adding copyright headers where they were missing
- fix a few import statements
- minor javadoc cleanup here and there
- used IDEA to find and fix redundant type casts and unused assignments.
Index: DebugEvaluationExceptionHandler.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/DebugEvaluationExceptionHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DebugEvaluationExceptionHandler.java 17 Jul 2002 07:34:12 -0000 1.6
--- DebugEvaluationExceptionHandler.java 11 Nov 2002 19:22:37 -0000 1.7
***************
*** 129,133 ****
}
// and rethrow it
! throw (PropertyException) propEx;
}
--- 129,133 ----
}
// and rethrow it
! throw propEx;
}
Index: IntrospectionUtils.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/IntrospectionUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntrospectionUtils.java 15 Jun 2002 05:53:46 -0000 1.1
--- IntrospectionUtils.java 11 Nov 2002 19:22:37 -0000 1.2
***************
*** 1,8 ****
/*
! * IntrospectionUtils.java
*
! * Created on May 25, 2002, 5:42 PM
*/
-
package org.webmacro.engine;
--- 1,23 ----
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
*
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted under the terms of either of the following
! * Open Source licenses:
! *
! * The GNU General Public License, version 2, or any later version, as
! * published by the Free Software Foundation
! * (http://www.fsf.org/copyleft/gpl.html);
! *
! * or
! *
! * The Semiotek Public License (http://webmacro.org/LICENSE.)
! *
! * This software is provided "as is", with NO WARRANTY, not even the
! * implied warranties of fitness to purpose, or merchantability. You
! * assume all risks and liabilities associated with its use.
! *
! * See www.webmacro.org for more information on the WebMacro project.
*/
package org.webmacro.engine;
***************
*** 10,13 ****
--- 25,29 ----
*
* @author Keats
+ * @since May 25, 2002
*/
public class IntrospectionUtils {
***************
*** 73,77 ****
// try each constructor with the right number of args,
// untill one works or all have failed
- Exception lastException = null;
java.lang.reflect.Constructor[] cons = c.getConstructors();
for (int i=0; i<cons.length; i++){
--- 89,92 ----
***************
*** 82,86 ****
break; // if successful, we're done!
} catch (Exception e){
! lastException = e;
}
}
--- 97,101 ----
break; // if successful, we're done!
} catch (Exception e){
!
}
}
Index: MethodWrapper.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/MethodWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MethodWrapper.java 15 Jun 2002 05:53:17 -0000 1.1
--- MethodWrapper.java 11 Nov 2002 19:22:37 -0000 1.2
***************
*** 1,15 ****
/*
! * MethodWrapper.java
*
! * Created on May 24, 2002, 12:01 AM
*/
-
package org.webmacro.engine;
import java.lang.reflect.Method;
import org.webmacro.*;
! import java.io.IOException;
/**
*
* @author Keats
*/
public class MethodWrapper {
--- 1,31 ----
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
*
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted under the terms of either of the following
! * Open Source licenses:
! *
! * The GNU General Public License, version 2, or any later version, as
! * published by the Free Software Foundation
! * (http://www.fsf.org/copyleft/gpl.html);
! *
! * or
! *
! * The Semiotek Public License (http://webmacro.org/LICENSE.)
! *
! * This software is provided "as is", with NO WARRANTY, not even the
! * implied warranties of fitness to purpose, or merchantability. You
! * assume all risks and liabilities associated with its use.
! *
! * See www.webmacro.org for more information on the WebMacro project.
*/
package org.webmacro.engine;
import java.lang.reflect.Method;
import org.webmacro.*;
!
/**
*
* @author Keats
+ * @since May 24, 2002
*/
public class MethodWrapper {
***************
*** 60,64 ****
Class[] types = IntrospectionUtils.createTypesFromArgs(args);
for (int i = 0; i < _methods.length; i++){
! Method m = (Method) _methods[i];
Class[] sig = m.getParameterTypes();
if (IntrospectionUtils.matches(sig,types)) {
--- 76,80 ----
Class[] types = IntrospectionUtils.createTypesFromArgs(args);
for (int i = 0; i < _methods.length; i++){
! Method m = _methods[i];
Class[] sig = m.getParameterTypes();
if (IntrospectionUtils.matches(sig,types)) {
Index: StaticClassWrapper.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/StaticClassWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StaticClassWrapper.java 11 Jun 2002 17:43:22 -0000 1.2
--- StaticClassWrapper.java 11 Nov 2002 19:22:37 -0000 1.3
***************
*** 1,8 ****
/*
! * StaticClassWrapper.java
*
! * Created on June 1, 2001, 12:25 PM
*/
-
package org.webmacro.engine;
--- 1,23 ----
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
*
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted under the terms of either of the following
! * Open Source licenses:
! *
! * The GNU General Public License, version 2, or any later version, as
! * published by the Free Software Foundation
! * (http://www.fsf.org/copyleft/gpl.html);
! *
! * or
! *
! * The Semiotek Public License (http://webmacro.org/LICENSE.)
! *
! * This software is provided "as is", with NO WARRANTY, not even the
! * implied warranties of fitness to purpose, or merchantability. You
! * assume all risks and liabilities associated with its use.
! *
! * See www.webmacro.org for more information on the WebMacro project.
*/
package org.webmacro.engine;
***************
*** 12,15 ****
--- 27,31 ----
* @author keats_kirsch
* @version
+ * @since June 1, 2001
*/
final public class StaticClassWrapper {
Index: VoidMacro.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/VoidMacro.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VoidMacro.java 11 Jun 2002 17:43:22 -0000 1.4
--- VoidMacro.java 11 Nov 2002 19:22:37 -0000 1.5
***************
*** 38,45 ****
/**
! * Returns null.
! *
! * @return null
! * @exception PropertyException if required data was missing from context
*/
public Object evaluate(Context context)
--- 38,42 ----
/**
! * Always throws a new <code>PropertyException.VoidValueException</code>
*/
public Object evaluate(Context context)
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/directive
Modified Files:
AlternateDirective.java CountDirective.java
IncludeDirective.java TypeDirective.java
Log Message:
- adding copyright headers where they were missing
- fix a few import statements
- minor javadoc cleanup here and there
- used IDEA to find and fix redundant type casts and unused assignments.
Index: AlternateDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/AlternateDirective.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AlternateDirective.java 11 Nov 2002 04:26:12 -0000 1.10
--- AlternateDirective.java 11 Nov 2002 19:22:36 -0000 1.11
***************
*** 109,113 ****
Iterator itr = context.getBroker()._propertyOperators.getIterator(l);
! target.setValue(context, (Object) new IteratorAlternator(itr));
}
catch (Exception e) {
--- 109,113 ----
Iterator itr = context.getBroker()._propertyOperators.getIterator(l);
! target.setValue(context, new IteratorAlternator(itr));
}
catch (Exception e) {
Index: CountDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/CountDirective.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CountDirective.java 11 Nov 2002 04:26:12 -0000 1.3
--- CountDirective.java 11 Nov 2002 19:22:36 -0000 1.4
***************
*** 1,9 ****
/*
! * Created by IntelliJ IDEA.
! * User: e_ridge
! * Date: Oct 18, 2002
! * Time: 4:44:50 PM
! * To change template for new class use
! * Code Style | Class Templates options (Tools | IDE Options).
*/
package org.webmacro.directive;
--- 1,22 ----
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted under the terms of either of the following
! * Open Source licenses:
! *
! * The GNU General Public License, version 2, or any later version, as
! * published by the Free Software Foundation
! * (http://www.fsf.org/copyleft/gpl.html);
! *
! * or
! *
! * The Semiotek Public License (http://webmacro.org/LICENSE.)
! *
! * This software is provided "as is", with NO WARRANTY, not even the
! * implied warranties of fitness to purpose, or merchantability. You
! * assume all risks and liabilities associated with its use.
! *
! * See www.webmacro.org for more information on the WebMacro project.
*/
package org.webmacro.directive;
***************
*** 17,20 ****
--- 30,36 ----
/**
* #count $i from 1 to 100 [step 1]
+ *
+ * @author Eric B. Ridge (eb...@tc...)
+ * @since 1.1b1
*/
public class CountDirective extends org.webmacro.directive.Directive {
Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IncludeDirective.java 5 Nov 2002 22:01:28 -0000 1.14
--- IncludeDirective.java 11 Nov 2002 19:22:36 -0000 1.15
***************
*** 472,483 ****
catch (ResourceException re) {
try {
- java.net.URL url = b.getResource(name);
try {
- // this does not work for me, because
- // getContent() returns an instance of
- // a BufferedInputStream() on my platform.
// The UrlProvider knows, how to do this,
// so let him do the work for us
- //return url.getContent ().toString();
return b.get("url", name).toString();
}
--- 472,478 ----
Index: TypeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/TypeDirective.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TypeDirective.java 12 Jun 2002 17:35:34 -0000 1.6
--- TypeDirective.java 11 Nov 2002 19:22:36 -0000 1.7
***************
*** 1,8 ****
/*
! * TypeDirective.java
*
! * Created on June 13, 2001, 12:22 AM
*/
-
package org.webmacro.directive;
--- 1,23 ----
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
*
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted under the terms of either of the following
! * Open Source licenses:
! *
! * The GNU General Public License, version 2, or any later version, as
! * published by the Free Software Foundation
! * (http://www.fsf.org/copyleft/gpl.html);
! *
! * or
! *
! * The Semiotek Public License (http://webmacro.org/LICENSE.)
! *
! * This software is provided "as is", with NO WARRANTY, not even the
! * implied warranties of fitness to purpose, or merchantability. You
! * assume all risks and liabilities associated with its use.
! *
! * See www.webmacro.org for more information on the WebMacro project.
*/
package org.webmacro.directive;
|
|
From: <dr...@us...> - 2002-11-11 19:23:09
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro
Modified Files:
FastWriter.java
Log Message:
- adding copyright headers where they were missing
- fix a few import statements
- minor javadoc cleanup here and there
- used IDEA to find and fix redundant type casts and unused assignments.
Index: FastWriter.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/FastWriter.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** FastWriter.java 29 Jul 2002 07:07:01 -0000 1.26
--- FastWriter.java 11 Nov 2002 19:22:35 -0000 1.27
***************
*** 457,461 ****
String encoding )
throws UnsupportedEncodingException {
! FastWriter fw = null;
Pool p = ( Pool ) WRITERCACHE.get( encoding );
if ( p != null ) {
--- 457,461 ----
String encoding )
throws UnsupportedEncodingException {
! FastWriter fw;
Pool p = ( Pool ) WRITERCACHE.get( encoding );
if ( p != null ) {
|
|
From: <dr...@us...> - 2002-11-11 19:22:42
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/util Modified Files: CastUtil.java LogTargetFactory.java WMEval.java Log Message: - adding copyright headers where they were missing - fix a few import statements - minor javadoc cleanup here and there - used IDEA to find and fix redundant type casts and unused assignments. Index: CastUtil.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/CastUtil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CastUtil.java 12 Jun 2002 17:17:28 -0000 1.6 --- CastUtil.java 11 Nov 2002 19:22:38 -0000 1.7 *************** *** 1,8 **** /* ! * CastUtil.java * ! * Created on April 19, 2001, 4:02 PM */ - package org.webmacro.util; --- 1,23 ---- /* ! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved. * ! * Redistribution and use in source and binary forms, with or without ! * modification, are permitted under the terms of either of the following ! * Open Source licenses: ! * ! * The GNU General Public License, version 2, or any later version, as ! * published by the Free Software Foundation ! * (http://www.fsf.org/copyleft/gpl.html); ! * ! * or ! * ! * The Semiotek Public License (http://webmacro.org/LICENSE.) ! * ! * This software is provided "as is", with NO WARRANTY, not even the ! * implied warranties of fitness to purpose, or merchantability. You ! * assume all risks and liabilities associated with its use. ! * ! * See www.webmacro.org for more information on the WebMacro project. */ package org.webmacro.util; Index: LogTargetFactory.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogTargetFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LogTargetFactory.java 11 Jun 2002 17:43:23 -0000 1.2 --- LogTargetFactory.java 11 Nov 2002 19:22:39 -0000 1.3 *************** *** 1,8 **** /* ! * LogTargetFactory.java * ! * Created on August 21, 2001, 1:41 PM */ - package org.webmacro.util; --- 1,23 ---- /* ! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved. * ! * Redistribution and use in source and binary forms, with or without ! * modification, are permitted under the terms of either of the following ! * Open Source licenses: ! * ! * The GNU General Public License, version 2, or any later version, as ! * published by the Free Software Foundation ! * (http://www.fsf.org/copyleft/gpl.html); ! * ! * or ! * ! * The Semiotek Public License (http://webmacro.org/LICENSE.) ! * ! * This software is provided "as is", with NO WARRANTY, not even the ! * implied warranties of fitness to purpose, or merchantability. You ! * assume all risks and liabilities associated with its use. ! * ! * See www.webmacro.org for more information on the WebMacro project. */ package org.webmacro.util; Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/WMEval.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WMEval.java 11 Jun 2002 17:43:23 -0000 1.8 --- WMEval.java 11 Nov 2002 19:22:39 -0000 1.9 *************** *** 136,140 **** /** * Supplies the parsed rule directly. ! * @param parsedRule The rule parsed possibly from a previous run. */ public void setParsedTemplate(Template parsedTemplate) { --- 136,140 ---- /** * Supplies the parsed rule directly. ! * @param parsedTemplate The rule parsed possibly from a previous run. */ public void setParsedTemplate(Template parsedTemplate) { *************** *** 233,237 **** * Evaluates the context using a file template sending the output to a disk file. * @param context The context to use. ! * @param inputTemplateFileName The input template file in the resource path. * @param outputFileName The absolute path to a file. If null, the context * key OutputFileName must be present. --- 233,237 ---- * Evaluates the context using a file template sending the output to a disk file. * @param context The context to use. ! * @param templateResourceFile The input template file in the resource path. * @param outputFileName The absolute path to a file. If null, the context * key OutputFileName must be present. |
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/resource Modified Files: BrokerTemplateLoader.java GenerationalCacheManager.java ReloadDelayDecorator.java URLTemplateProvider.java UrlProvider.java Log Message: - adding copyright headers where they were missing - fix a few import statements - minor javadoc cleanup here and there - used IDEA to find and fix redundant type casts and unused assignments. Index: BrokerTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BrokerTemplateLoader.java 11 Jun 2002 17:43:22 -0000 1.2 --- BrokerTemplateLoader.java 11 Nov 2002 19:22:37 -0000 1.3 *************** *** 1,2 **** --- 1,23 ---- + /* + * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted under the terms of either of the following + * Open Source licenses: + * + * The GNU General Public License, version 2, or any later version, as + * published by the Free Software Foundation + * (http://www.fsf.org/copyleft/gpl.html); + * + * or + * + * The Semiotek Public License (http://webmacro.org/LICENSE.) + * + * This software is provided "as is", with NO WARRANTY, not even the + * implied warranties of fitness to purpose, or merchantability. You + * assume all risks and liabilities associated with its use. + * + * See www.webmacro.org for more information on the WebMacro project. + */ package org.webmacro.resource; Index: GenerationalCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/GenerationalCacheManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GenerationalCacheManager.java 12 Jun 2002 17:35:34 -0000 1.5 --- GenerationalCacheManager.java 11 Nov 2002 19:22:37 -0000 1.6 *************** *** 20,23 **** --- 20,35 ---- * See www.webmacro.org for more information on the WebMacro project. */ + package org.webmacro.resource; + + import org.opendoors.cache.UpdateableCache; + import org.opendoors.cache.immutable.CacheFactory; + import org.opendoors.cache.immutable.CacheImpl; + + import org.webmacro.Broker; + import org.webmacro.InitException; + import org.webmacro.Log; + import org.webmacro.ResourceException; + import org.webmacro.util.Settings; + import org.webmacro.util.SubSettings; /** *************** *** 36,61 **** * This cache manager supports reloadability * of a cache entry provided the cache element knows how ! * to test itself for having become stale. ! * <a href="mailto:la...@op...">Architecture Support</a> ! * @since 0.96 ! */ ! package org.webmacro.resource; ! ! import org.opendoors.cache.UpdateableCache; ! import org.opendoors.cache.immutable.CacheFactory; ! import org.opendoors.cache.immutable.CacheImpl; ! ! import org.webmacro.Broker; ! import org.webmacro.InitException; ! import org.webmacro.Log; ! import org.webmacro.ResourceException; ! import org.webmacro.util.Settings; ! import org.webmacro.util.SubSettings; ! ! /** * The GenerationalCacheManager implements the CacheManager * interface for WebMacro providers which extend the CachingProvider * base class. This implementation encapsulates the use of VFC * provided by Open Doors Software and incorporated into WM. */ public class GenerationalCacheManager implements CacheManager { --- 48,60 ---- * This cache manager supports reloadability * of a cache entry provided the cache element knows how ! * to test itself for having become stale.<p> ! * * The GenerationalCacheManager implements the CacheManager * interface for WebMacro providers which extend the CachingProvider * base class. This implementation encapsulates the use of VFC * provided by Open Doors Software and incorporated into WM. + * + * @author Lane Sharman (la...@op...) + * @since 0.96 */ public class GenerationalCacheManager implements CacheManager { Index: ReloadDelayDecorator.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/ReloadDelayDecorator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReloadDelayDecorator.java 11 Jun 2002 17:43:22 -0000 1.3 --- ReloadDelayDecorator.java 11 Nov 2002 19:22:37 -0000 1.4 *************** *** 1,2 **** --- 1,23 ---- + /* + * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted under the terms of either of the following + * Open Source licenses: + * + * The GNU General Public License, version 2, or any later version, as + * published by the Free Software Foundation + * (http://www.fsf.org/copyleft/gpl.html); + * + * or + * + * The Semiotek Public License (http://webmacro.org/LICENSE.) + * + * This software is provided "as is", with NO WARRANTY, not even the + * implied warranties of fitness to purpose, or merchantability. You + * assume all risks and liabilities associated with its use. + * + * See www.webmacro.org for more information on the WebMacro project. + */ package org.webmacro.resource; Index: URLTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplateProvider.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** URLTemplateProvider.java 12 Jun 2002 17:35:34 -0000 1.16 --- URLTemplateProvider.java 11 Nov 2002 19:22:37 -0000 1.17 *************** *** 390,394 **** } else if (tPart.startsWith(CONTEXT_PREFIX)) { - tPart = tPart.substring(CONTEXT_PREFIX_LENGTH); throw new IllegalStateException("Not implemented"); } --- 390,393 ---- Index: UrlProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/UrlProvider.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** UrlProvider.java 11 Jun 2002 17:43:22 -0000 1.12 --- UrlProvider.java 11 Nov 2002 19:22:37 -0000 1.13 *************** *** 119,123 **** length = 1024; } ! long now = System.currentTimeMillis(); long timeout = uc.getExpiration(); --- 119,123 ---- length = 1024; } ! /** long now = System.currentTimeMillis(); long timeout = uc.getExpiration(); *************** *** 131,134 **** --- 131,135 ---- timeout = MAX_TIMEOUT; else if (timeout < MIN_TIMEOUT) timeout = MIN_TIMEOUT; + **/ char buf[] = new char[1024]; |
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/servlet Modified Files: LocaleTool.java RequestTool.java ResponseTool.java ServletLog.java SessionTool.java URLTool.java Log Message: - adding copyright headers where they were missing - fix a few import statements - minor javadoc cleanup here and there - used IDEA to find and fix redundant type casts and unused assignments. Index: LocaleTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/LocaleTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LocaleTool.java 11 Jun 2002 17:43:22 -0000 1.6 --- LocaleTool.java 11 Nov 2002 19:22:38 -0000 1.7 *************** *** 26,31 **** import java.lang.reflect.Field; import java.util.*; - import javax.servlet.*; - import javax.servlet.http.*; import org.webmacro.Context; --- 26,29 ---- Index: RequestTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/RequestTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RequestTool.java 11 Jun 2002 17:43:22 -0000 1.6 --- RequestTool.java 11 Nov 2002 19:22:38 -0000 1.7 *************** *** 24,30 **** package org.webmacro.servlet; - import javax.servlet.*; - import javax.servlet.http.*; - import org.webmacro.Context; import org.webmacro.ContextTool; --- 24,27 ---- Index: ResponseTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ResponseTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ResponseTool.java 11 Jun 2002 17:43:22 -0000 1.6 --- ResponseTool.java 11 Nov 2002 19:22:38 -0000 1.7 *************** *** 24,30 **** package org.webmacro.servlet; - import javax.servlet.*; - import javax.servlet.http.*; - import org.webmacro.Context; import org.webmacro.ContextTool; --- 24,27 ---- Index: ServletLog.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ServletLog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServletLog.java 10 Nov 2002 20:35:08 -0000 1.5 --- ServletLog.java 11 Nov 2002 19:22:38 -0000 1.6 *************** *** 20,33 **** * See www.webmacro.org for more information on the WebMacro project. */ - - - /** - * - * Implementation of AbstractLogFile which directs log information to - * the servlet log. - * @since 0.96 - * @author Brian Goetz - */ - package org.webmacro.servlet; --- 20,23 ---- *************** *** 41,44 **** --- 31,41 ---- import org.webmacro.util.Settings; + /** + * + * Implementation of AbstractLogFile which directs log information to + * the servlet log. + * @since 0.96 + * @author Brian Goetz + */ public class ServletLog extends AbstractLogFile { Index: SessionTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/SessionTool.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SessionTool.java 11 Jun 2002 17:43:22 -0000 1.8 --- SessionTool.java 11 Nov 2002 19:22:38 -0000 1.9 *************** *** 24,28 **** package org.webmacro.servlet; - import javax.servlet.*; import javax.servlet.http.*; --- 24,27 ---- *************** *** 32,36 **** /** ! * Provide Template with access to form data. */ public class SessionTool implements ContextTool { --- 31,36 ---- /** ! * Provide Template with access to the HttpSession associated ! * with the current request. */ public class SessionTool implements ContextTool { Index: URLTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/URLTool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** URLTool.java 11 Jun 2002 17:43:22 -0000 1.2 --- URLTool.java 11 Nov 2002 19:22:38 -0000 1.3 *************** *** 24,28 **** package org.webmacro.servlet; - import javax.servlet.*; import javax.servlet.http.*; --- 24,27 ---- |
|
From: <dr...@us...> - 2002-11-11 05:05:31
|
Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv21316
Modified Files:
build.xml
Log Message:
*sigh* Eventually I'll stop committing stupid changes.
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** build.xml 11 Nov 2002 04:53:10 -0000 1.25
--- build.xml 11 Nov 2002 05:05:29 -0000 1.26
***************
*** 48,52 ****
! <target name="precompile" depends="prepare" >
<javacc target="src/org/webmacro/parser/WMParser_impl.jj"
javacchome="${javacc.home}" />
--- 48,52 ----
! <target name="precompile" depends="prepare" if="javacc.present">
<javacc target="src/org/webmacro/parser/WMParser_impl.jj"
javacchome="${javacc.home}" />
|
|
From: <dr...@us...> - 2002-11-11 04:55:36
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory usw-pr-cvs1:/tmp/cvs-serv18931/test/unit/org/webmacro/template
Modified Files:
TemplateTestCase.java
Log Message:
Doh! That wasn't supposed to be committed.
Index: TemplateTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TemplateTestCase.java 11 Nov 2002 04:53:13 -0000 1.9
--- TemplateTestCase.java 11 Nov 2002 04:55:33 -0000 1.10
***************
*** 44,49 ****
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 ();
--- 44,49 ----
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 ();
|
|
From: <dr...@us...> - 2002-11-11 04:53:44
|
Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv18116
Modified Files:
build.xml
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: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** build.xml 10 Nov 2002 22:09:42 -0000 1.24
--- build.xml 11 Nov 2002 04:53:10 -0000 1.25
***************
*** 48,52 ****
! <target name="precompile" depends="prepare" if="javacc.present">
<javacc target="src/org/webmacro/parser/WMParser_impl.jj"
javacchome="${javacc.home}" />
--- 48,52 ----
! <target name="precompile" depends="prepare" >
<javacc target="src/org/webmacro/parser/WMParser_impl.jj"
javacchome="${javacc.home}" />
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory usw-pr-cvs1:/tmp/cvs-serv18116/src/org/webmacro/parser
Modified Files:
CharStream.java WMParser_impl.java WMParser_impl.jj
WMParser_implConstants.java WMParser_implTokenManager.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: CharStream.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/CharStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CharStream.java 11 Jun 2002 17:43:22 -0000 1.3
--- CharStream.java 11 Nov 2002 04:53:11 -0000 1.4
***************
*** 1,3 ****
! /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 0.7pre6 */
package org.webmacro.parser;
--- 1,3 ----
! /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 2.1 */
package org.webmacro.parser;
***************
*** 19,110 ****
public interface CharStream {
! /**
! * Returns the next character from the selected input. The method
! * of selecting the input is the responsibility of the class
! * implementing this interface. Can throw any java.io.IOException.
! */
! abstract public char readChar() throws java.io.IOException;
! /**
! * Returns the column position of the character last read.
! * @deprecated
! * @see #getEndColumn
! */
! abstract public int getColumn();
! /**
! * Returns the line number of the character last read.
! * @deprecated
! * @see #getEndLine
! */
! abstract public int getLine();
! /**
! * Returns the column number of the last character for current token (being
! * matched after the last call to BeginTOken).
! */
! abstract public int getEndColumn();
! /**
! * Returns the line number of the last character for current token (being
! * matched after the last call to BeginTOken).
! */
! abstract public int getEndLine();
! /**
! * Returns the column number of the first character for current token (being
! * matched after the last call to BeginTOken).
! */
! abstract public int getBeginColumn();
! /**
! * Returns the line number of the first character for current token (being
! * matched after the last call to BeginTOken).
! */
! abstract public int getBeginLine();
! /**
! * Backs up the input stream by amount steps. Lexer calls this method if it
! * had already read some characters, but could not use them to match a
! * (longer) token. So, they will be used again as the prefix of the next
! * token and it is the implemetation's responsibility to do this right.
! */
! abstract public void backup(int amount);
! /**
! * Returns the next character that marks the beginning of the next token.
! * All characters must remain in the buffer between two successive calls
! * to this method to implement backup correctly.
! */
! abstract public char BeginToken() throws java.io.IOException;
! /**
! * Returns a string made up of characters from the marked token beginning
! * to the current buffer position. Implementations have the choice of returning
! * anything that they want to. For example, for efficiency, one might decide
! * to just return null, which is a valid implementation.
! */
! abstract public String GetImage();
! /**
! * Returns an array of characters that make up the suffix of length 'len' for
! * the currently matched token. This is used to build up the matched string
! * for use in actions in the case of MORE. A simple and inefficient
! * implementation of this is as follows :
! *
! * {
! * String t = GetImage();
! * return t.substring(t.length() - len, t.length()).toCharArray();
! * }
! */
! abstract public char[] GetSuffix(int len);
! /**
! * The lexer calls this function to indicate that it is done with the stream
! * and hence implementations can free any resources held by this class.
! * Again, the body of this function can be just empty and it will not
! * affect the lexer's operation.
! */
! abstract public void Done();
}
--- 19,110 ----
public interface CharStream {
! /**
! * Returns the next character from the selected input. The method
! * of selecting the input is the responsibility of the class
! * implementing this interface. Can throw any java.io.IOException.
! */
! char readChar() throws java.io.IOException;
! /**
! * Returns the column position of the character last read.
! * @deprecated
! * @see #getEndColumn
! */
! int getColumn();
! /**
! * Returns the line number of the character last read.
! * @deprecated
! * @see #getEndLine
! */
! int getLine();
! /**
! * Returns the column number of the last character for current token (being
! * matched after the last call to BeginTOken).
! */
! int getEndColumn();
! /**
! * Returns the line number of the last character for current token (being
! * matched after the last call to BeginTOken).
! */
! int getEndLine();
! /**
! * Returns the column number of the first character for current token (being
! * matched after the last call to BeginTOken).
! */
! int getBeginColumn();
! /**
! * Returns the line number of the first character for current token (being
! * matched after the last call to BeginTOken).
! */
! int getBeginLine();
! /**
! * Backs up the input stream by amount steps. Lexer calls this method if it
! * had already read some characters, but could not use them to match a
! * (longer) token. So, they will be used again as the prefix of the next
! * token and it is the implemetation's responsibility to do this right.
! */
! void backup(int amount);
! /**
! * Returns the next character that marks the beginning of the next token.
! * All characters must remain in the buffer between two successive calls
! * to this method to implement backup correctly.
! */
! char BeginToken() throws java.io.IOException;
! /**
! * Returns a string made up of characters from the marked token beginning
! * to the current buffer position. Implementations have the choice of returning
! * anything that they want to. For example, for efficiency, one might decide
! * to just return null, which is a valid implementation.
! */
! String GetImage();
! /**
! * Returns an array of characters that make up the suffix of length 'len' for
! * the currently matched token. This is used to build up the matched string
! * for use in actions in the case of MORE. A simple and inefficient
! * implementation of this is as follows :
! *
! * {
! * String t = GetImage();
! * return t.substring(t.length() - len, t.length()).toCharArray();
! * }
! */
! char[] GetSuffix(int len);
! /**
! * The lexer calls this function to indicate that it is done with the stream
! * and hence implementations can free any resources held by this class.
! * Again, the body of this function can be just empty and it will not
! * affect the lexer's operation.
! */
! void Done();
}
Index: WMParser_impl.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** WMParser_impl.java 15 Jun 2002 05:49:00 -0000 1.42
--- WMParser_impl.java 11 Nov 2002 04:53:11 -0000 1.43
***************
*** 24,3093 ****
public class WMParser_impl implements WMParser_implConstants {
!
! private Broker broker;
! private BackupCharStream stream;
! private Stack blockStack = new Stack();
! private String templateName;
!
! public WMParser_impl(Broker broker,
! String templateName,
[...6111 lines suppressed...]
! jj_rescan = false;
! }
!
! final private void jj_save(int index, int xla) {
! JJCalls p = jj_2_rtns[index];
! while (p.gen > jj_gen) {
! if (p.next == null) { p = p.next = new JJCalls(); break; }
! p = p.next;
}
! p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
! }
!
! static final class JJCalls {
! int gen;
! Token first;
! int arg;
! JJCalls next;
! }
!
}
Index: WMParser_impl.jj
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.jj,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** WMParser_impl.jj 15 Jun 2002 06:03:20 -0000 1.41
--- WMParser_impl.jj 11 Nov 2002 04:53:12 -0000 1.42
***************
*** 158,163 ****
// Warning routines
! private void warnDeprecated(String feature) {
! broker.getLog("parser").warning("Deprecated feature: " + feature);
}
}
--- 158,163 ----
// Warning routines
! private void warnDeprecated(String feature, int line, int col) {
! broker.getLog("parser").warning("Deprecated feature: " + feature + " at " + line + "." + col);
}
}
***************
*** 751,755 ****
( LOOKAHEAD(<DOT><WORD>) <DOT> t=<WORD> { element = t.image; }
[ <LPAREN> argList=ArgList() <RPAREN>
! { element = new PropertyMethodBuilder((String) element, argList); }
]
{ v.add(element); }
--- 751,755 ----
( LOOKAHEAD(<DOT><WORD>) <DOT> t=<WORD> { element = t.image; }
[ <LPAREN> argList=ArgList() <RPAREN>
! { element = new PropertyMethodBuilder((String) element, argList); }
]
{ v.add(element); }
***************
*** 763,770 ****
{
<DOLLAR>
! [ <DOLLAR> { warnDeprecated(DDOLLAR_FEATURE); } ]
(
LOOKAHEAD(2)
! t=<WORD><SEMI> { v.add(t.image); warnDeprecated(SEMI_FEATURE); }
| VariableReferenceGuts(v)
| <LPAREN> VariableReferenceGuts(v) <RPAREN>
--- 763,770 ----
{
<DOLLAR>
! [ t=<DOLLAR> { warnDeprecated(DDOLLAR_FEATURE, t.beginLine, t.beginColumn); } ]
(
LOOKAHEAD(2)
! t=<WORD><SEMI> { v.add(t.image); warnDeprecated(SEMI_FEATURE, t.beginLine, t.beginColumn); }
| VariableReferenceGuts(v)
| <LPAREN> VariableReferenceGuts(v) <RPAREN>
Index: WMParser_implConstants.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_implConstants.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WMParser_implConstants.java 11 Jun 2002 17:43:22 -0000 1.9
--- WMParser_implConstants.java 11 Nov 2002 04:53:12 -0000 1.10
***************
*** 4,131 ****
public interface WMParser_implConstants {
! int EOF = 0;
! int _ALPHA_CHAR = 1;
! int _NUM_CHAR = 2;
! int _ALPHANUM_CHAR = 3;
! int _IDENTIFIER_CHAR = 4;
! int _IDENTIFIER = 5;
! int _NEWLINE = 6;
! int _WHITESPACE = 7;
! int _QCHAR = 8;
! int _RESTOFLINE = 9;
! int _COMMENT = 10;
! int STUFF = 11;
! int RBRACE = 12;
! int END = 13;
! int BEGIN = 14;
! int LBRACE = 15;
! int POUNDPOUND = 17;
! int RESTOFLINE = 18;
! int COMMENT_ELSE = 19;
! int DOLLAR = 20;
! int QCHAR = 21;
! int SLASH = 22;
! int POUND = 23;
! int QUOTE = 24;
! int SQUOTE = 25;
! int NULL = 26;
! int TRUE = 27;
! int FALSE = 28;
! int UNDEFINED = 29;
! int WS = 30;
! int NEWLINE = 31;
! int LPAREN = 32;
! int RPAREN = 33;
! int LBRACKET = 34;
! int RBRACKET = 35;
! int DOT = 36;
! int OP_LT = 37;
! int OP_LE = 38;
! int OP_GT = 39;
! int OP_GE = 40;
! int OP_EQ = 41;
! int OP_SET = 42;
! int OP_NE = 43;
! int OP_PLUS = 44;
! int OP_MINUS = 45;
! int OP_MULT = 46;
! int OP_DIV = 47;
! int OP_AND = 48;
! int OP_OR = 49;
! int OP_NOT = 50;
! int COMMA = 51;
! int SEMI = 52;
! int WORD = 53;
! int NUMBER = 54;
! int OTHER = 55;
! int QS_TEXT = 56;
! int SQS_TEXT = 57;
! int SQS = 0;
! int QS = 1;
! int COMMENT = 2;
! int WM = 3;
! int DEFAULT = 4;
! String[] tokenImage = {
! "<EOF>",
! "<_ALPHA_CHAR>",
! "<_NUM_CHAR>",
! "<_ALPHANUM_CHAR>",
! "<_IDENTIFIER_CHAR>",
! "<_IDENTIFIER>",
! "<_NEWLINE>",
! "<_WHITESPACE>",
! "<_QCHAR>",
! "<_RESTOFLINE>",
! "<_COMMENT>",
! "<STUFF>",
! "\"}\"",
! "\"#end\"",
! "\"#begin\"",
! "\"{\"",
! "<token of kind 16>",
! "\"##\"",
! "<RESTOFLINE>",
! "<COMMENT_ELSE>",
! "\"$\"",
! "<QCHAR>",
! "\"\\\\\"",
! "\"#\"",
! "\"\\\"\"",
! "\"\\\'\"",
! "\"null\"",
! "\"true\"",
! "\"false\"",
! "\"undefined\"",
! "<WS>",
! "<NEWLINE>",
! "\"(\"",
! "\")\"",
! "\"[\"",
! "\"]\"",
! "\".\"",
! "\"<\"",
! "\"<=\"",
! "\">\"",
! "\">=\"",
! "\"==\"",
! "\"=\"",
! "<OP_NE>",
! "\"+\"",
! "\"-\"",
! "\"*\"",
! "\"/\"",
! "<OP_AND>",
! "<OP_OR>",
! "<OP_NOT>",
! "\",\"",
! "\";\"",
! "<WORD>",
! "<NUMBER>",
! "<OTHER>",
! "<QS_TEXT>",
! "<SQS_TEXT>",
! };
}
--- 4,131 ----
public interface WMParser_implConstants {
! int EOF = 0;
! int _ALPHA_CHAR = 1;
! int _NUM_CHAR = 2;
! int _ALPHANUM_CHAR = 3;
! int _IDENTIFIER_CHAR = 4;
! int _IDENTIFIER = 5;
! int _NEWLINE = 6;
! int _WHITESPACE = 7;
! int _QCHAR = 8;
! int _RESTOFLINE = 9;
! int _COMMENT = 10;
! int STUFF = 11;
! int RBRACE = 12;
! int END = 13;
! int BEGIN = 14;
! int LBRACE = 15;
! int POUNDPOUND = 17;
! int RESTOFLINE = 18;
! int COMMENT_ELSE = 19;
! int DOLLAR = 20;
! int QCHAR = 21;
! int SLASH = 22;
! int POUND = 23;
! int QUOTE = 24;
! int SQUOTE = 25;
! int NULL = 26;
! int TRUE = 27;
! int FALSE = 28;
! int UNDEFINED = 29;
! int WS = 30;
! int NEWLINE = 31;
! int LPAREN = 32;
! int RPAREN = 33;
! int LBRACKET = 34;
! int RBRACKET = 35;
! int DOT = 36;
! int OP_LT = 37;
! int OP_LE = 38;
! int OP_GT = 39;
! int OP_GE = 40;
! int OP_EQ = 41;
! int OP_SET = 42;
! int OP_NE = 43;
! int OP_PLUS = 44;
! int OP_MINUS = 45;
! int OP_MULT = 46;
! int OP_DIV = 47;
! int OP_AND = 48;
! int OP_OR = 49;
! int OP_NOT = 50;
! int COMMA = 51;
! int SEMI = 52;
! int WORD = 53;
! int NUMBER = 54;
! int OTHER = 55;
! int QS_TEXT = 56;
! int SQS_TEXT = 57;
! int SQS = 0;
! int QS = 1;
! int COMMENT = 2;
! int WM = 3;
! int DEFAULT = 4;
! String[] tokenImage = {
! "<EOF>",
! "<_ALPHA_CHAR>",
! "<_NUM_CHAR>",
! "<_ALPHANUM_CHAR>",
! "<_IDENTIFIER_CHAR>",
! "<_IDENTIFIER>",
! "<_NEWLINE>",
! "<_WHITESPACE>",
! "<_QCHAR>",
! "<_RESTOFLINE>",
! "<_COMMENT>",
! "<STUFF>",
! "\"}\"",
! "\"#end\"",
! "\"#begin\"",
! "\"{\"",
! "<token of kind 16>",
! "\"##\"",
! "<RESTOFLINE>",
! "<COMMENT_ELSE>",
! "\"$\"",
! "<QCHAR>",
! "\"\\\\\"",
! "\"#\"",
! "\"\\\"\"",
! "\"\\\'\"",
! "\"null\"",
! "\"true\"",
! "\"false\"",
! "\"undefined\"",
! "<WS>",
! "<NEWLINE>",
! "\"(\"",
! "\")\"",
! "\"[\"",
! "\"]\"",
! "\".\"",
! "\"<\"",
! "\"<=\"",
! "\">\"",
! "\">=\"",
! "\"==\"",
! "\"=\"",
! "<OP_NE>",
! "\"+\"",
! "\"-\"",
! "\"*\"",
! "\"/\"",
! "<OP_AND>",
! "<OP_OR>",
! "<OP_NOT>",
! "\",\"",
! "\";\"",
! "<WORD>",
! "<NUMBER>",
! "<OTHER>",
! "<QS_TEXT>",
! "<SQS_TEXT>",
! };
}
Index: WMParser_implTokenManager.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_implTokenManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** WMParser_implTokenManager.java 11 Jun 2002 17:43:22 -0000 1.22
--- WMParser_implTokenManager.java 11 Nov 2002 04:53:12 -0000 1.23
***************
*** 1,1556 ****
/* Generated By:JavaCC: Do not edit this line. WMParser_implTokenManager.java */
package org.webmacro.parser;
!
! public class WMParser_implTokenManager implements WMParser_implConstants {
!
! // Required by SetState
! void backup(int n) {
! input_stream.backup(n);
! }
[...3108 lines suppressed...]
+ else
+ error_column++;
+ }
+ if (!EOFSeen) {
+ input_stream.backup(1);
+ error_after = curPos <= 1 ? "" : input_stream.GetImage();
+ }
+ throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+ }
+ }
! final void TokenLexicalActions(Token matchedToken)
! {
! switch(jjmatchedKind)
! {
! default :
! break;
}
+ }
}
|
|
From: <dr...@us...> - 2002-11-11 04:53:16
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory usw-pr-cvs1:/tmp/cvs-serv18116/test/unit/org/webmacro/template
Modified Files:
TemplateTestCase.java TestCountDirective.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: TemplateTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TemplateTestCase.java 10 Nov 2002 21:45:46 -0000 1.8
--- TemplateTestCase.java 11 Nov 2002 04:53:13 -0000 1.9
***************
*** 44,49 ****
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 ();
--- 44,49 ----
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 ();
Index: TestCountDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestCountDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCountDirective.java 11 Nov 2002 04:26:12 -0000 1.1
--- TestCountDirective.java 11 Nov 2002 04:53:13 -0000 1.2
***************
*** 77,80 ****
assert (i == null);
}
!
! }
--- 77,79 ----
assert (i == null);
}
! }
\ No newline at end of file
|
6 messages has been excluded from this view by a project administrator.
