dlr 01/06/21 16:40:14
Modified: convert Tag: VEL_1_1_BRANCH convert.wm
src/java/org/apache/velocity/convert Tag: VEL_1_1_BRANCH
WebMacro.java
Log:
Backported fix to HEAD: Added test case demonstrating and fix for explictly
terminated WebMacro statement conversion to formal VTL reference.
Revision Changes Path
No revision
No revision
1.4.2.2 +2 -0 jakarta-velocity/convert/convert.wm
Index: convert.wm
===================================================================
RCS file: /home/cvs/jakarta-velocity/convert/convert.wm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- convert.wm 2001/06/21 02:54:53 1.4.2.1
+++ convert.wm 2001/06/21 23:40:12 1.4.2.2
@@ -1,5 +1,7 @@
## This is a template to convert.
+<input type="submit" name="Button" value="$prevStep">
+
#foreach $this in $that
#begin
This is the text
No revision
No revision
1.15.2.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/convert/WebMacro.java
Index: WebMacro.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/convert/WebMacro.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- WebMacro.java 2001/06/21 02:54:54 1.15.2.1
+++ WebMacro.java 2001/06/21 23:40:13 1.15.2.2
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: WebMacro.java,v 1.15.2.1 2001/06/21 02:54:54 dlr Exp $
+ * @version $Id: WebMacro.java,v 1.15.2.2 2001/06/21 23:40:13 dlr Exp $
*/
public class WebMacro
{
@@ -132,7 +132,7 @@
"$1$2",
// Convert explicitly terminated WM statements to VTL syntax.
- "(^|[^\\\\])\\$(\\w[^=\n;]*);",
+ "(^|[^\\\\])\\$(\\w[^=\n;'\"]*);",
"$1${$2}",
// Change extensions when seen.
