You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/05/29 17:35:15 UTC

svn commit: r1343781 [16/17] - in /incubator/flex/trunk/modules: ./ thirdparty/velocity/ thirdparty/velocity/build/ thirdparty/velocity/build/lib/ thirdparty/velocity/build/xsl/ thirdparty/velocity/src/java/org/apache/velocity/anakia/ thirdparty/veloci...

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/reference.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/reference.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/reference.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/reference.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,75 @@
+
+
+bar
+   $_foo equals "bar" : bar
+
+Late introspection :
+
+7
+
+
+More stupid reference escaping ...
+
+When it does exist in the context :
+
+foo
+$foo
+$!foo
+$!foo
+$\!foo
+\$!foo
+
+And when it doesn't :
+
+$bar
+\$bar
+
+\$!bar  (because it's just text...)
+
+$!foo
+$\!foo
+$\\!foo
+$\\\!foo
+\\$!foo
+
+Misc tests :
+
+[$foo.bar]
+
+
+Test lower case property names 
+
+lunatic
+lunatic
+
+ vector element 1
+ vector element 2
+ vector element 1
+ vector element 2
+
+Now test if we can use lowercase for propertes in set
+Was : lunatic
+Now : geir
+Back : lunatic
+
+Test what was a bug :
+
+boycat.java
+boycat.java
+
+
+More tests :
+
+lunatic
+$lunatic
+#lunatic
+
+$foo.bar ($bar) 
+
+Test boolean introspection isFoo()
+
+  Correct
+
+
+   Correct
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/sample.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/sample.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/sample.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/sample.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,30 @@
+
+
+<html>
+<head><title>Sample velocity page</title></head>
+<body bgcolor="#ffffff">
+<center>
+
+<h2>Hello from velocity!</h2>
+<i>Here's the list of people</i>
+<table cellspacing="0" cellpadding="5" widht="100%">
+    <tr>
+        <td bgcolor="#eeeeee" align="center">
+            Names
+        </td>
+    </tr>
+        <tr>
+        <td bgcolor="#eeeeee">ArrayList element 1</td>
+    </tr>
+        <tr>
+        <td bgcolor="#eeeeee">ArrayList element 2</td>
+    </tr>
+        <tr>
+        <td bgcolor="#eeeeee">ArrayList element 3</td>
+    </tr>
+        <tr>
+        <td bgcolor="#eeeeee">ArrayList element 4</td>
+    </tr>
+    </table>
+</center>
+</html>

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/settest.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/settest.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/settest.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/settest.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,17 @@
+*
+
+@test settest.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+Tests #set parsing funkyness
+*#
+
+
+
+  I am setthing : bar
+
+SessionBean#setSessionContext

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/shorthand.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/shorthand.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/shorthand.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/shorthand.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1 @@
+<input type="text" name="email" value="">

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/string-interpolation.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/string-interpolation.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/string-interpolation.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/string-interpolation.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,10 @@
+it will cost you $10.00
+
+dog.jpg
+
+foobar.jpg
+
+foobar.jpg
+
+123
+1 2 3

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/subclass.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/subclass.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/subclass.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/subclass.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+Person
+Child

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/test.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/test.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/test.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/test.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,162 @@
+
+
+<html>
+<body>
+
+jason
+
+
+
+
+
+
+this is testing for wild loose commas , ,
+
+$100
+
+
+
+This is the bar way.
+
+    This is $bar.
+
+    This is the if.
+
+
+#set $foo = "bar"
+
+$foo   => bar
+$foo;  => bar;
+$foo.  => bar.
+$foo.. => bar..
+$foo/  => bar/
+$foo"  => bar"
+$foo\  => bar\
+$foo<  => bar<
+\$foo-  => $foo-
+\$fooo+ => $fooo+
+\$foo-x => $foo-x
+$foo$  => bar$
+
+
+
+jon
+ nothing here
+
+function preload(imgObj,imgSrc)
+{
+    if (document.images) 
+    {
+        eval(imgObj+' = new Image()')
+        eval(imgObj+'.src = "'+imgSrc+'"')
+    }
+}
+
+function changeImage(layer,imgName,imgObj)
+{
+    if (document.images)
+    {
+        if (document.layers && layer!=null) eval('document.'+layer+'.document.images["'+imgName+'"].src = '+imgObj+'.src')
+        else document.images[imgName].src = eval(imgObj+".src")
+    }
+}
+
+
+<!-- This is an HTML comment -->
+
+
+$provider2.Title
+
+x
+
+x
+
+<input type="text" name="email" value="">
+<input type="text" name="email" value="">
+
+
+lunatic
+
+
+lunatic
+
+
+
+
+
+crocodile hunter!
+
+
+
+<!-- look here -->
+
+lunatic
+
+
+
+jason
+
+
+jason
+
+
+
+
+
+
+
+
+
+    This is a property that returns a boolean
+    value of true.
+
+    This expression is always (true).
+
+
+Foreach with a variable.
+
+    This is ArrayList element 1.
+    This is ArrayList element 2.
+    This is ArrayList element 3.
+    This is ArrayList element 4.
+
+Foreach with an array.
+
+<table>
+    <tr>
+        <td>This is first element</td>
+    </tr>        
+    <tr>
+        <td>This is second element</td>
+    </tr>        
+</table>
+
+
+    This is the vector element 1.
+    This is the vector element 2.
+
+
+Foreach with a method.
+
+    This is ArrayList element 1.
+    This is ArrayList element 2.
+    This is ArrayList element 3.
+    This is ArrayList element 4.
+
+$10.00
+
+"this is great"
+
+(this is also great)
+
+This is the \#stuff and this
+is the way \#to \#go.
+
+this = that
+
+I am a jason.
+
+    Yes the APL rules!
+
+</body>
+</html>

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,49 @@
+
+
+
+Now, use the #quietnull example from the global library VM_global_library.vm : 
+Now, there should be nothing in the brackets : ><
+
+Where there should be something here : >hello!<
+
+
+<table>
+   <tr><tdi bgcolor=blue>$10.24</td></tr>
+   <tr><tdi bgcolor=blue>$15.32</td></tr>
+   <tr><tdi bgcolor=blue>$12.15</td></tr>
+</table>
+
+
+Further tests.  The following VMs and non-VM should be properly escaped :
+#tablerow
+#quietnull
+\#notavm
+>\<
+
+Now try to define a new quietnull VM :
+
+It should have been rejected, as the default is to not let inlines override existing, and there
+should be a message in velocity.log.
+Therefore it should still function normally :
+>hello!<
+><
+
+We should be able to use argless VMs (and directives....)
+
+Hello! I have no args!
+
+
+And there was a bug where I wasn't getting the params right for the use-instance :
+
+
+Arg :>$jdom.getRootElement().getChild("properties").getChild("author").getTextTrim()<
+
+String literals should work as you expect :
+Arg :>stringliteral<
+
+
+Test boolean args :
+
+   arg true
+      arg false
+ - Another fine Velocity Production -

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/velocimacro2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,43 @@
+
+
+
+
+  Hello from foo : hi
+  Hello from foo2 : hi
+  Hello from foo_two : hi
+
+
+  Hello from foo : $notincontext
+  Hello from foo : $notincontext.getThing()
+
+
+
+      $notincontext :  no
+        $notincontext.woogie() :  no
+  
+
+      bar :  yes
+  
+  Hello from foo2 : bar
+
+
+      <td align=center class=v10><b>#</b></td>
+    <td align=center class=v10><b> # </b></td>
+    <td align=center class=v10><b>\#</b></td>
+  
+
+
+ hi victor  
+
+
+
+
+>1<
+>true<
+>false<
+>hello<
+>hello<
+>1<
+>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]<
+>[a, b, 1]<
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test1.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test1.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test1.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test1.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,8 @@
+
+
+     global recurse 5
+          global recurse 4
+          global recurse 3
+          global recurse 2
+          global recurse 1
+            
\ No newline at end of file

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/vm_test2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,9 @@
+
+
+
+     local recurse 5
+          local recurse 4
+          local recurse 3
+          local recurse 2
+          local recurse 1
+            
\ No newline at end of file

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/context_safety.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/context_safety.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/context_safety.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/context_safety.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+#foreach($a in $vector)
+ $a
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/context_safety.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/diabolical.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/diabolical.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/diabolical.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/diabolical.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,62 @@
+#*
+
+@test diabolical.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression
+test doesn't fail incorrectly.
+
+This is for wierd strangeness that doesn't have any other home.
+
+*#
+
+$f.
+$f
+$f. $f
+#set($f = "foo")
+$f.
+$f
+$f. $f
+$thingy.dingy
+"#FFFFFF"
+"$ow"
+
+"$row","var"
+#333333
+#FFFFFF
+"#FFFFF
+#FFFFF"
+"#000000">
+"#ffffff"
+
+$strings.getVillageType($col.Type)
+$strings.getVillageType( $col.Type)
+$strings.getVillageType($col.Type )
+
+
+-#-# Inline loops #-#-
+
+blargh>#foreach($a in  $stringarray)<$a>#end<blargh
+blargh>#foreach($a in  $stringarray) <$a>#end<blargh
+blargh>#foreach($a in  $stringarray)<$a> #end<blargh
+blargh>#foreach($a in  $stringarray) <$a> #end<blargh
+
+#"FFFF
+-#-#-#-#-#
+#-#-#-#
+$-$-$-$-
+#FF00FF00
+#'FF
+
+$tstrings.chop($generator.parse("sql/mysql/columns", "", "table", $tbl),1)
+$provider.chop("stringy",1)
+
+#set($foo = "foo") 
+#if ($foo.length()>0)$foo#end 
+#set($bar = "bar") 
+#if ($bar.length()>0)$bar#end 
+
+
+#set($a=1)
+#0F

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/diabolical.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,4 @@
+Thanks to Kent Johnson for this example and the nudge.
+
+<p>Chinese: 网站登录</p>
+<p>Spanish: niño</p>

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest2.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest2.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest2.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest2.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,4 @@
+This is an example of chinese code encoding:
+
+#set ($ch = "上网")
+The chinese string is $ch, its length is $ch.length()

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest2.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest3.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest3.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest3.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest3.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,19 @@
+<table>
+<tr>
+<td>
+<strong>
+Chinese/GBK
+</strong>
+</td>
+<td>
+<p>
+50ÄêÇ°µÄ½ñÌ죬ÖйúÈËÃñÖ¾Ô¸¾üÐÛôñôñÆø°º°º£¬ÔÚÈýǧÀュɽÉÏ¿ªÊ¼¿¹ÃÀÔ®³¯£¬±£¼ÒÎÀ¹ú¡£ÔÚÄǶοɸè¿ÉÆüµÄËêÔÂÖУ¬¶àÉÙÖйúÈËΪǰ·½Ö¾Ô¸¾ü½«Ê¿µÄ¾«ÉñËù¹ÄÎ裬ÔÚ¼ÄÍÐÃÀºÃ×£Ô¸µÄͬʱ£¬Ò²½«¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕâÁ½¸öÃû´ÊƵƵΪ×Ô¼º¸Õ³öÉúµÄ×ÓÅ®ÃüÃû¡£50ÄêÀ´£¬¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÃÇ´ø×ÅÕⳡսÕùµÄÀúÊ·ºÛ¼££¬Ò»¸ö¸öµ½Á˽«½ü°ë°ÙµÄÄêÁ䣬½ñÌ죬ËûÃǹ¤×÷¡¢Éú»îµÃÈçºÎ£¿ÄǶÎÀúÊ·ÔÚ½ñÌìµÄËûÃÇÑÛÀÓÖÊÇÔõÑùÒ»·¬¾°Ï󣿱¾±¨¼ÇÕß×òÌìÏÂÎçÆð·ÖÍ·×·×Ù£¬Ñ°·ÃÄϾ©´ó½ÖСÏïÖеġ°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£
+<p>
+×·×ÙÒÁʼ£¬ÎÒÃÇÊ×ÏȺÍÄϾ©Êй«°²¾ÖµÄ»§Õþ¹ÜÀí²¿ÃÅÈ¡µÃÁËÁªÏµ£¬Ï£ÍûÄÜͨ¹ýËûÃDz鵽ÄϾ©Êе½µ×ÓжàÉÙ¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£ÄϾ©ÊÐÇø250ÍòÈË¿Ú£¬¼ÓÉÏÎåÏس¬¹ý500ÍòÈË¿Ú£¬²éÒ»±éÈËÃûÆÄ·Ñʱ¼ä¡£ËûÃÇ´óÁ¦Ö§³Ö£¬ÔÚ¹¤×÷Öмû·ì²åÕëΪÎÒÃÇ°²ÅÅÁËÉÏ»ú²éѯ£¬ÎÒÃÇÏÈ´Ó¡°Ô®³¯¡±²éÆ𣬾­¹ý½üÁ½¸öСʱµÄµçÄÔ²éѯ£¬ÄϾ©ÊÐÇø¹²²éµ½ÓÐ233λÊÐÃñµÄÃû×ÖÖк¬ÓС°Ô®³¯¡±¡£²é¡°¿¹ÃÀ¡±ÎÒÃDz»¸ÒÔÙ¡°É§ÈÅ¡±ËûÃÇÈç´Ë·ÑÁ¦²éѯ£¬±ã½øÐÐÁ˳éÑù²éѯ£¬½á¹û²éµÃÄϾ©Ãû½Ð¡°ÕÅ¿¹ÃÀ¡±µÄÓÐ6¸ö£¬¡°Íõ¿¹ÃÀ¡±8¸ö£¬¡°ËÃÀ¡±3¸ö£¬¡°ÀÃÀ¡±2¸ö£¬±ÈÆð¡°Ô®³¯¡±£¬¡°¿¹ÃÀ¡±Ò²²»ÔÚÉÙÊý¡£
+<p>
+ÔÚ²éѯ¡°Ô®³¯¡±µÄ¹ý³ÌÖУ¬ÓÉÓÚÊÇûÓÐÉ趨±»²éѯÕßµÄÄêÁäµÄ£¬½á¹û233¸ö¡°Ô®³¯¡±ÖУ¬²¢²»ÊÇÎÒÃÇÏëÏñÖж¼ÊÇ1950ÄêÖÁ1954ÄêÕâ¶Îʱ¼äÄÚ³öÉúµÄ£¬ÓÐЩÈ˵ijöÉúÄê·ÝÊÇ1944Äê¡¢1945Ä꣬¸ÃÊй«°²¾Ö»§Õþ¿ÆµÄͬ־˵£¬ÕâЩÈ˺ܿÉÄÜÊÇÔÚÉÏСѧʱȡµÄÃû»ò¸ÄµÄÃû£¬ÄÇʱÕýÖµ³¯ÏÊÕ½ÕùÆڼ䣬¸¸Ä¸Ëæ×ŵ±Ê±³±Á÷Ò²¸øº¢×ÓÈ¡(¸Ä)ÁËÕâÑùµÄÃû¡£
+<p>
+²éѯ×ÊÁÏÏÔʾ£¬¾ø´ó¶àÊý¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¶¼ÊÇ50Äê´ú³õµÄ¼¸Äê¼ä³öÊÀ¡£»§Õþ¿ÆµÄһλŮͬ־»ØÒä˵£¬ÄÇ»á½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕæÊÇÒ»ÖÖʱ´úµÄ³±Á÷£¬Ëý¼ÇµÃµ±Ê±ÁÚ¾Ó¼ÒÓÐ4¸öСº¢£¬ÒÀ´Î¾Í½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡¢¡°±£¼Ò¡±¡¢¡°ÎÀ¹ú¡±£¬½ÐÒ»±é×Ô¼Òº¢×ÓµÄÃû×Ö£¬Õæ¸öÊÇÓÐÖÖ¡°ÐÛôñôñÆø°º°º¡±µÄ¸Ð¾õÔÚÐļ䡣
+<td>
+</tr>
+</table>
\ No newline at end of file

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest3.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest3.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest_KOI8-R.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest_KOI8-R.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest_KOI8-R.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest_KOI8-R.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,104 @@
+From - Sat Jun  2 11:47:36 2001
+Return-Path: <ve...@jakarta.apache.org>
+Received: from mta1.srv.hcvlny.cv.net (mta1.srv.hcvlny.cv.net [167.206.5.4])
+	by s1.optonline.net (8.10.2/8.10.2) with ESMTP id f4U9uVc26907
+	for <@m...@optonline.net>; Wed, 30 May 2001 05:56:31 -0400 (EDT)
+Received: from apache.org (h31.sny.collab.net [64.208.42.41])
+ by mta1.srv.hcvlny.cv.net
+ (iPlanet Messaging Server 5.0 Patch 2 (built Dec 14 2000))
+ with SMTP id <0G...@mta1.srv.hcvlny.cv.net> for geirm@optonline.net
+ (ORCPT geirm@optonline.net); Wed, 30 May 2001 05:56:33 -0400 (EDT)
+Received: (qmail 19350 invoked by uid 500); Wed, 30 May 2001 09:56:20 +0000
+Received: (qmail 19153 invoked from network); Wed, 30 May 2001 09:56:18 +0000
+Date: Wed, 30 May 2001 13:57:17 +0400
+From: Vitaly Repetenko <vi...@mtu.ru>
+Subject: Re: Russian Character Encoding
+To: velocity-user@jakarta.apache.org
+Reply-to: velocity-user@jakarta.apache.org
+Message-id: <3B...@mtu.ru>
+Organization: MTU-Intel
+MIME-version: 1.0
+X-Mailer: Mozilla 4.77 [en] (Windows NT 5.0; U)
+Content-type: multipart/mixed; boundary="Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)"
+X-Accept-Language: ru,en
+Precedence: bulk
+Delivered-to: mailing list velocity-user@jakarta.apache.org
+Mailing-List: contact velocity-user-help@jakarta.apache.org; run by ezmlm
+X-Recipient: velocity-user@jakarta.apache.org
+X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N
+References: <3B...@mtu.ru> <3B...@optonline.net>
+ <3B...@mtu.ru> <3B...@optonline.net>
+ <3B...@mtu.ru> <3B...@optonline.net>
+List-Post: <ma...@jakarta.apache.org>
+List-Subscribe: <ma...@jakarta.apache.org>
+List-Unsubscribe: <ma...@jakarta.apache.org>
+List-Help: <ma...@jakarta.apache.org>
+X-Mozilla-Status: 8011
+X-Mozilla-Status2: 00000000
+X-UIDL: a57ee51a80f6ed07173b135dbac0735e
+
+This is a multi-part message in MIME format.
+
+--Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)
+Content-type: text/plain; charset=koi8-r
+Content-transfer-encoding: 7BIT
+
+template
+
+"Geir Magnusson Jr." wrote:
+
+> Vitaly Repetenko wrote:
+> >
+> > Hi!
+> >
+> > Test is attached.
+> >
+> > Not only russian capital "U" is converted into space but russian capital "F" (ASCII
+> > code E6) also.
+> >
+>
+> Can you attach a test template?  Or better yet, see if the latest in CVS
+> fixes it?  It might have gone in later than the nightly snapshot, so you
+> may need to just get a dump from CVS.
+>
+> geir
+>
+> --
+> Geir Magnusson Jr.                           geirm@optonline.net
+> System and Software Consulting
+> Developing for the web?  See http://jakarta.apache.org/velocity/
+> "still climbing up to the shoulders..."
+
+--Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)
+Content-type: text/html; charset=koi8-r; name=charset_test.vm
+Content-transfer-encoding: 8BIT
+Content-disposition: inline; filename=charset_test.vm
+
+<html>
+<head><title>Russian charset test</title></head>
+<body bgcolor="#ffffff">
+
+<pre>
+ABCDEFGHIJKLMNOPRSTUVWXYZ
+abcdefghijklmnoprstuvwxyz
+
+Russian alphabet:(32 chars) Displayed without codes 0xF5 0xE6 (code page KOI8-R)
+
+Â×ÞÚÄųÃßÊËÌÍÎÏÐÒÔÕÆÈÖÉÇÀÙÜÑÝÛÁÓ
+                    ^^
+------------------>F5E6
+â÷þúäå£ãÿêëìíîïðòôõæèöéçàùüñýûáó
+
+alt="Èõíèúê"
+     ^
+---->F5
+alt="Öêúâ"
+     ^
+---->E6
+</pre>
+
+</html>
+
+
+--Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)--
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest_KOI8-R.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/encodingtest_KOI8-R.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/equality.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/equality.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/equality.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/equality.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,31 @@
+#*
+
+@test equality.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#set($user = "jason")
+#set($login = false)
+#set($count = 5)
+
+#if ($user == "jason")
+    the user $user is logged in!
+#end
+
+
+#if ($count == 5)
+    the count is 5!
+#end
+
+#if ($login == false)
+    the user isn't logged in.
+#end
+
+#if ($count != 3)
+    \$count is not equal to 3
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/equality.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/equality.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,55 @@
+#*
+
+@test escape.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+\A
+
+\#set($woo = "bar")
+#set($woo = "bar")
+
+\$woo => $woo
+
+The following should print 'as is' : 
+$f\oo
+\a
+"\r"
+
+Now, test the built in directives. Note that $foo isn't in the context :
+\#set($foo = $foo + 1)
+\#set(\$foo = $foo + 1)
+\#if($foo)
+\#if ( $foo )
+\#else
+\#end
+\#elseif(
+
+Now, a reference not in the context:
+\$foo -> $foo
+\#if($foo)
+\#if(\$foo)
+
+Put it in :
+#set($foo = 1)
+\$foo -> $foo
+\#if($foo)
+\#if(\$foo)
+
+This isn't in the context, so we get the full monty :
+	\$woobie.blagh()
+
+The following two are references :
+	\$provider.Title = $provider.Title
+	\$provider.getTitle() = $provider.getTitle()
+
+Now, pluggable directives:
+
+\#notadirective
+\#foreach
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape2.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape2.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape2.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape2.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,138 @@
+#*
+@test escape2.vm
+
+More interesting cases...
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression
+test doesn't fail incorrectly.
+
+*#
+--- Schmoo ---
+
+These are not in the context, so they should render as they are here (schmoo).
+$foo
+\$foo
+\\$foo
+
+\#woogie
+\\#woogie
+\\\#woogie
+
+Now put $foo in the context :
+#set($foo = "bar")
+\$foo = $foo
+\\\$foo =\\$foo
+\\\\\$foo =\\\\$foo
+
+As we increase the number of \'s, we alternate renderings :
+$foo
+\$foo
+\\$foo
+\\\$foo
+\\\\$foo
+
+--- Pluggable Directives ----
+
+We are doing an \#include("test.txt"), starting with 0 '\' preceeding :
+
+#include("test.txt")
+\#include("test.txt")
+\\#include("test.txt")
+\\\#include("test.txt")
+\\\\#include("test.txt")
+
+Now, foreach is a PD.  Escape the first one, and then not the second so it
+renders.  The third and fourth examples show the single 'unpleasantry' about this.  The \
+is only an escape when 'touching' VTL, otherwise, it's just schmoo.
+
+\#foreach(
+
+\\#foreach($a in $stringarray) $a \\#end
+
+\\#foreach($a in $stringarray) $a \ \\#end
+
+\\#foreach($a in $stringarray)$a\ \\#end
+
+
+--- Control Structures ----
+
+First should be escaped...
+\#if(true) hi \#end
+
+This isn't.  Note then that it has to render the \\ as a \ because it's stuck to the VTL
+
+\\#if(true) hi \\#end
+
+\\#if(true) hi #end
+
+And so forth...
+\\\#if(true) hi \\\#end
+
+\\\\#if(true) hi \\\\#end
+
+And more...
+
+\#if(true)
+	hi
+\#else
+	there
+\#end
+
+\\#if(true)
+	hi
+\\#else
+	there
+\\#end
+
+\\\#if(true)
+	hi
+\\\#else
+	there
+\\\#end
+
+\\#if(false)
+	hi
+\\#elseif(true)
+	there
+\\#end
+
+\\\#if(false)
+	hi
+\\\#elseif(true)
+	there
+\\\#end
+
+## testing combinations like #$foo
+
+#$foo1
+\#$foo1
+#${foo1}
+\#$${foo1}
+#set($foo1 = "C0C0C0")
+#$foo1
+\#$foo1
+#${foo1}
+\#$${foo1}
+#\$${foo1}
+
+## and wacky stuff that are not references, but
+## because of the MORE tokens, get screwed up
+
+$(QUERY_STRING{forumid})
+\$(QUERY_STRING{forumid})
+\\$(QUERY_STRING{forumid})
+
+##
+##  and just slashes....
+##
+
+\
+\\
+\\\
+\\\\
+\\\\\
+\\\\\\
+\\\\\\\
+\\\\\\\\

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape2.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/escape2.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-array.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-array.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-array.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-array.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,56 @@
+#*
+
+@test foreach-array.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+--Foreach with an array. 2 blank lines follow
+
+##foreach ($element in $provider.Array)
+
+<table>
+#foreach ($element in $stringarray)
+    <tr>
+        <td>This is $element and it is the $velocityCount item</td>
+    </tr>        
+#end
+</table>
+
+--Foreach with a null array.  1 blank line follows
+
+<table>
+#foreach ($element in $woogiefoogie)
+    <tr>
+        <td>This is $element and it is the $velocityCount item</td>
+    </tr>        
+#end
+</table>
+
+-- And when we declare the array in-template :
+
+#set($colors=["red","blue","green"])
+Choose among :
+#foreach( $color in $colors )
+	$color
+#end
+
+#set($bar= 'bar')
+#set($foo = [ 'a' ])
+#set($foo2 = [ $bar ])
+#set($foo2 = [$bar ])
+#set($foo2 = [ $bar])
+#set($foo2 = [ $bar] )
+#foreach( $i in $foo )
+ \$foo : $i
+#end
+
+#foreach($i in $foo2)
+ \$foo2 : $i
+#end
+
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-array.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-array.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-introspect.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-introspect.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-introspect.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-introspect.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,13 @@
+##
+## tests a difficult introspection problem -
+## the iterator is a private inner class
+##
+
+#set($array = [1..10])
+#set($it = $array.iterator())
+
+#foreach($num in [21..30])
+   $num $it.next()
+#end
+
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-introspect.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-introspect.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-map.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-map.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-map.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-map.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,14 @@
+#**
+
+@test foreach-map.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#foreach ($element in $provider.Hashtable)
+    $element
+#end    

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-map.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-map.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-method.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-method.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-method.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-method.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,16 @@
+#*
+
+@test foreach-method.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+Foreach with a method.
+
+#foreach ($element in $provider.getCustomers())
+    This is $element.
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-method.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-method.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-type.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-type.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-type.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-type.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,48 @@
+#*
+
+@test foreach-type.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+Using a Object []
+
+#foreach( $i in $obarr)
+  $i
+#end
+
+Using a Map
+
+#foreach( $i in $map )
+  $i
+#end
+
+Using a Collection
+
+#foreach($i in $collection )
+  $i
+#end
+
+Using an Iterator
+
+#foreach($i in $iterator )
+  $i 
+#end
+
+
+Using an Enumeration
+
+#foreach($i in $enumerator)
+  $i
+#end
+
+
+Using an array of primitives
+
+#foreach( $i in $intarr )
+  $i
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-type.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-type.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-variable.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-variable.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-variable.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-variable.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,32 @@
+#*
+
+@test foreach-variable.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+Foreach with a variable.
+
+#foreach ($element in $list)
+    This is $element.
+    $velocityCount
+#end
+
+#foreach ($element in $list)
+    -- inner foreach --
+    #foreach ($element in $list)
+        This is $element.
+        $velocityCount
+    #end
+    -- inner foreach --
+
+    -- outer foreach --
+    This is $element.
+    $velocityCount
+    -- outer foreach --
+#end
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-variable.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/foreach-variable.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/formal.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/formal.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/formal.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/formal.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,46 @@
+#*
+
+@test formal.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+1. $!{provider.Title}
+
+2. $provider.Title
+
+3. $!provider.Title
+
+4. ${provider.Title}
+
+${provider.Title}${provider.Title}
+
+${provider.Title}MapBuilder
+
+${provider.Title}.map.${provider.Title}MapBuilder
+
+#set($this = "this")
+#set($that = "that")
+
+${this}${that}
+
+${provider.getTitle()}
+
+$provider.getHashtable().get( "key0")
+$provider.getHashtable().get("key1" )
+$provider.getHashtable().get(   "key2"                 )
+$provider.getHashtable().get("floogie!")
+
+## curly wierdness
+
+{$provider.Title
+$provider.Title}
+{$provider.Title}
+$provider}.Title
+${provider}.Title
+$provider{.Title
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/formal.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/formal.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/get.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/get.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/get.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/get.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,19 @@
+#*
+
+@test get.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+## Now the provider has been outfitted with
+## a get(key) method so it will just return
+## the key when asked for it.
+
+$provider.Muck
+$provider.Duck
+$provider.Truck
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/get.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/get.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/if.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/if.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/if.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/if.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+#*
+
+@test if.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#if (true)
+    this is true
+#end
+
+#if (false)
+    this is false
+#end
+
+#if ($foo)
+    this isn't defined yet.
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/if.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/if.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/ifstatement.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/ifstatement.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/ifstatement.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/ifstatement.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,79 @@
+#*
+
+@test ifstatement.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#set($foo = "woogie" )
+
+start :
+
+#if($foo)
+ right
+#end
+
+#if(!$foo)
+  wrong
+#else
+  right
+#end
+
+#if( !$foo )
+  wrong
+#else
+  right
+#end
+
+#if( ! $foo )
+  wrong
+#else
+  right
+#end
+
+#if( ! ! $foo )
+  right
+#end
+
+
+#if($bar)
+ wrong
+#else
+ right
+#end
+
+#if($bar)
+ wrong
+#elseif( $foo )
+ right
+#end
+
+#if( $bar )
+ wrong
+#elseif( $floogie )
+ wrong
+#elseif( $woppie )
+ wrong
+#else
+ right
+#end
+
+#if(!$bar)
+  right
+#end
+
+#if( !$bar)
+  right
+#end
+
+#if( !!$bar)
+ wrong
+#else
+ right
+#end
+
+done

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/ifstatement.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/ifstatement.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/include.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/include.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/include.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/include.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,17 @@
+#*
+
+@test include.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#include("include.vm" "include.vm")
+
+#set($foo = "subdir/test.txt")
+
+#include($foo)
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/include.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/include.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/interpolation.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/interpolation.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/interpolation.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/interpolation.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,65 @@
+#*
+
+@test interpolation.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+Start with simple string interpolation :
+
+#set($name = "jason")
+$provider.concat("it will cost you $10.00", "")
+
+#set($image = "dog")
+$provider.concat("${image}.jpg", "")
+
+#set($foo-bar = "foobar")
+$provider.concat("${foo-bar}.jpg", "")
+
+#set($foo_bar = "foobar")
+$provider.concat("${foo_bar}.jpg", "")
+
+#set($one = 1)
+#set($two = 2)
+#set($three = 3)
+$provider.concat("${one}${two}${three}", "")
+$provider.concat("$one $two $three", "")
+
+How about a directive?  Sure :
+
+#set($arr = ["a","b","c"])
+#set($foo = "#foreach($a in $arr) >$a< #end")
+
+$foo 
+
+For our next trick, lets interpolate a.... VelociMacro!
+
+#macro( interpfoo )
+  Hi, I'm a VM!
+#end
+
+#set($ivm = "#interpfoo()")
+
+$ivm
+
+And now, for something completely different :
+
+#set($code = "#if(false) True #else False #end")
+
+$code
+
+Now, non interpolated stringlits :
+
+#set($a = "$code")
+#set($b = '$code')
+#set($c = '$!$\!code')
+
+$a
+$b
+$c
+
+-- end --

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/interpolation.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/interpolation.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/literal.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/literal.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/literal.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/literal.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,23 @@
+#*
+
+@test literal.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#literal()
+
+#foreach ($woogie in $boogie)
+  nothing will happen to $woogie
+#end  
+
+#if($skin)
+    $!data.setLayoutTemplate($!skin.getLayout())
+    $!page.setCss($!skin.getCss())
+#end
+
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/literal.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/literal.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/logical.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/logical.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/logical.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/logical.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,346 @@
+#*
+
+@test logical.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression
+test doesn't fail incorrectly.
+
+*#
+
+#set($foo = 5)
+
+#if ($foo > 1)
+    \$foo is greater then 1
+#end
+
+#if ($foo < 10)
+    \$foo is less than 10
+#end
+
+#if ($foo >= 5)
+    \$foo is great than or equal to 5
+#end
+
+#if ($foo <= 5)
+    \$foo is less than or equal to 5
+#end
+
+#set($foo = false)
+
+#if (!($foo == true))
+    foo is false
+#end
+
+--
+
+#set($t = true)
+#set($f = false)
+
+Logical OR :
+
+#if($t || $f)
+ right
+#else
+ wrong
+#end
+
+#if( !($f || $t) )
+ wrong
+#else
+ right
+#end
+
+#if( $null || $t )
+ right
+#else
+ wrong
+#end
+
+#if( $t || $null )
+ right
+#else
+ wrong
+#end
+
+#if( $f || $null)
+ wrong
+#else
+ right
+#end
+
+#if( $null || $null )
+ wrong
+#else
+ right
+#end
+
+Logical AND :
+
+#if( $t && $t)
+ right
+#else
+ wrong
+#end
+
+#if( $f && $f )
+ wrong
+#else
+ right
+#end
+
+#if( !($f && $f) )
+ right
+#else
+ wrong
+#end
+
+#if( $t && $f )
+ wrong
+#else
+ right
+#end
+
+#if( $t && $null )
+ wrong
+#else
+ right
+#end
+
+#if( $null && $t )
+ wrong
+#else
+ right
+#end
+
+#if( $f && $null )
+ wrong
+#else
+ right
+#end
+
+#if( !($null && $null) )
+ right
+#else
+ wrong
+#end
+
+----------
+equivalence
+-----------
+
+#set($int = 1)
+#set($str = "str")
+#set($bool = true)
+
+#if( $int == $str)
+wrong
+#else
+right
+#end
+
+#if( $int == 1 )
+right
+#else
+wrong
+#end
+
+#if ( $int == 2 )
+wrong
+#else
+right
+#end
+
+#if( $str == 2 )
+wrong
+#else
+right
+#end
+
+#if( $str == "str")
+right
+#else
+wrong
+#end
+
+#if( $str == $nonexistantreference )
+wrong
+#else
+right
+#end
+
+#if( $str == $bool )
+wrong
+#else
+right
+#end
+
+#if ($bool == true )
+right
+#else
+wrong
+#end
+
+#if( $bool == false )
+wrong
+#else
+right
+#end
+
+-----------
+comparisons
+-----------
+#set($int = 1)
+#set($str = "str")
+#set($bool = true)
+
+#if( $int > 0 )
+right
+#else
+wrong
+#end
+
+#if( $str > 0 )
+wrong
+#else
+right
+#end
+
+#if( $nonexistant > 0 )
+wrong
+#else
+right
+#end
+
+#if( $int >= 0 )
+right
+#else
+wrong
+#end
+
+#if( $str >= 0 )
+wrong
+#else
+right
+#end
+
+#if( $nonexistant >= 0 )
+wrong
+#else
+right
+#end
+
+#if( $int < 10 )
+right
+#else
+wrong
+#end
+
+#if( $str < 10 )
+wrong
+#else
+right
+#end
+
+#if( $nonexistant < 10 )
+wrong
+#else
+right
+#end
+
+#if( $int <= 10 )
+right
+#else
+wrong
+#end
+
+#if( $str <= 10 )
+wrong
+#else
+right
+#end
+
+#if( $nonexistant <= 10 )
+wrong
+#else
+right
+#end
+
+----------------------
+goofy but legal stuff
+----------------------
+#set($lala = ( false || true ) )
+Should equal true : $lala
+
+#set($fofo = ( true && true ) )
+Should equal true : $fofo
+
+#set($fofo = ( true && ( false || true ) ) )
+Should equal true : $fofo
+
+#set($fofo = ( ($t || $f) && $t))
+Should equal true : $fofo
+
+
+#set($x = !true)
+
+#if($x == false)
+right
+#else
+wrong
+#end
+
+#set($y = !$x)
+
+#if($y == true)
+right
+#else
+wrong
+#end
+
+Test to see if we can do logical assignment from any expression
+
+#set($val = (3 == 3))
+#if($val == true)
+right
+#else
+wrong
+#end
+
+#set($val = (1 < 2))
+#if( $val == true)
+right
+#else
+wrong
+#end
+
+
+#set($val = (1 <= 2))
+#if( $val == true)
+right
+#else
+wrong
+#end
+
+
+#set($val = (7 > 2))
+#if( $val == true)
+right
+#else
+wrong
+#end
+
+#set($val = (7 >= 2))
+#if( $val == true)
+right
+#else
+wrong
+#end
+
+#set($val = ( 1 != 2))
+#if( $val == true)
+right
+#else
+wrong
+#end
\ No newline at end of file

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/logical.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/logical.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/loop.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/loop.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/loop.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/loop.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+#*
+
+@test loop.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#foreach ($element in $list)
+    #set($foo = $provider.concat(["<", $element, ">"]))
+    $provider.concat("hello", $foo)
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/loop.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/loop.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/map.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/map.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/map.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/map.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,25 @@
+#*
+
+@test map.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+## This is a valid Map and Bar is a valid
+## element.
+
+$hashtable.Bar
+
+## test the new Map support
+
+#set( $hashtable.Foo = "foovalue")
+$hashtable.get("Foo")
+$hashtable.Foo
+
+#set( $hashmap.Foo = "foovalue")
+$hashmap.Foo
+$hashmap.get("Foo")

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/map.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/map.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/math.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/math.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/math.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/math.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,38 @@
+#*
+
+@test escape.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+Tests the basic integer math capabilities.
+
+*#
+
+Addition and subtraction : 
+#set($foo = 1)
+#set($foo = $foo + 1)
+1 + 1 = $foo
+$foo - 1 = #set($foo = $foo - 1 )$foo
+
+Multiplication, division, and modulus :
+#set($bar = 5)
+#set($rem = $bar % 2)
+#set($rem2 = $bar % 0)
+#set($rem3 = 7%2)
+$bar % 2 = $rem
+$bar % 0 = $rem2
+7 % 2 = $rem3
+$bar / 2 = #set($rem = $bar / 2 )$rem
+$bar / 0 = #set($rem4 = $bar / 0 )$rem4
+$bar * 2 = #set($rem = $bar * 2 )$rem
+
+$bar * -1 = #set($rem = $bar * -1)$rem
+$bar * -2 = #set($rem = $bar *-2)$rem
+$bar * -2 = #set($rem = -2*$bar)$rem
+
+And now null nodes to make sure it doesn't throw an NPE :
+#set($flargh=$woogie + $wabbie)
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/math.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/math.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/method.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/method.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/method.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/method.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,13 @@
+#*
+
+@test method.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+$provider.concat(["I", "am", "a", $provider.concat(["running", "man"])])
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/method.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/method.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,18 @@
+#*
+
+@test parse.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+Test the \#parse pluggable directive 
+
+Now calling parse1.vm :
+---
+#parse("parse1.vm")
+---
+all done!

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse1.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse1.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse1.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse1.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+#*
+
+@test parse1.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+This is content from parse1.vm
+
+#foreach($a in $stringarray )
+	Hello $a.
+#end
+
+Now using a reference to get the next one :
+#set($foo = "parse2.vm")
+   --
+#parse($foo)
+   --
+done with parse1.vm

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse1.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse1.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse2.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse2.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse2.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse2.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+#*
+
+@test parse2.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+This is parse2.vm.
+
+#if (true)
+	This is from a true \#if.
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse2.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/parse2.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/pedantic.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/pedantic.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/pedantic.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/pedantic.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,101 @@
+#*
+
+@test pedantic.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression
+test doesn't fail incorrectly.
+
+*#
+#set( $pedantic = "pedantic")
+
+This is a test of the new #if($pedantic)$pedantic#end mode.
+
+There are a few things you can do in #if($foobar) GOOGLE! #else$pedantic#end mode.
+
+Like get the spacing between things #foreach($a in $stringarray)$a#end to be really, really tight.
+
+Further, it now binds any \n to the control structures, taking them out of the output.
+The hope that this is What You Expect. 
+So...
+
+--
+#if ($pedantic)
+$pedantic
+#end
+--
+
+should come out looking like
+
+--
+pedantic
+--
+
+But pay attention to what follows the \#end statement :
+
+1) First, follow with 'stuff' (not sure why you want to do this... but anway...)
+
+--
+#if ($pedantic)
+$pedantic
+#end woogie!
+--
+
+should be
+
+--
+pedantic
+ woogie!
+--
+
+2) Whitespace will be eaten if there is a following newline 
+
+--
+#if ($pedantic)
+$pedantic
+#end  		  
+--
+
+should be
+
+--
+pedantic
+--
+
+
+-- INLINE STUFF ---
+
+1) respect spaces in the block
+>#foreach($a in $stringarray)$a#end<
+>#foreach($a in $stringarray) $a#end<
+>#foreach($a in $stringarray)$a #end<
+>#foreach($a in $stringarray) $a #end<
+
+2) set statement has no output, incuding preceeding whitespace
+#foreach($a in $stringarray)
+		#set($b = $a)
+ $a is $b
+#end
+
+	public void foo( String lala )
+	{
+#foreach($a in $stringarray)
+		#set($b = $a)
+  		System.out.println("$b"); 
+#end
+	}
+
+	public void foo( String lala )
+	{
+	#foreach($a in $stringarray)
+		#set($b = $a)
+  	System.out.println("$b"); 
+	#end
+	}
+
+Inline set statement :
+
+Here are the prices :#set( $arr = ["$10.24","$15.32","$12.15"] ) #foreach($a in $arr) $a #end
+
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/pedantic.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/pedantic.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/quotes.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/quotes.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/quotes.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/quotes.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,21 @@
+#*
+
+@test quotes.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#set($this = "that")
+
+#if (true)
+    "what is $this"
+#end
+
+<input type="checkbox" name="$name" #if($checked)checked="1"#end/>
+ 
+<input type="checkbox" name="$hashtable.Bar" #if($checked)checked="1"#end/>
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/quotes.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/quotes.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/range.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/range.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/range.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/range.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,77 @@
+#*
+
+@test range.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+Tests the range operator [n..m]
+
+*#
+[1..5]
+#foreach($i in [1..5]) $i #end
+
+-----
+[0..0]
+#foreach($i in [0..0]) $i #end
+
+-----
+[-4..-5]
+#foreach($i in [-4..-5]) $i #end
+
+-----
+[ 1 .. 5 ]
+#foreach($i in [ 1 .. 5 ]) $i #end
+
+-----
+[5..1]
+#foreach($i in [5..1]) $i #end
+
+-----
+[-5..5]
+#foreach($i in [-5..5]) $i #end
+
+-----
+[5..-5]
+#foreach($i in [5..-5]) $i #end
+
+-----
+#set($a = 1)
+#set($b = 5)
+refs \$a=$a \$b=$b [\$a..\$b]
+#foreach($i in [$a..$b]) $i #end
+
+-----
+[\$a.. 7]
+#foreach($i in [$a.. 7]) $i #end
+
+-----
+[-7 ..\$a]
+#foreach($i in [-7 ..$a]) $i #end
+
+-----
+[ -7 ..\$a]
+#foreach($i in[ -7 ..$a]) $i #end
+
+------
+#set($foo = [0..5])
+setting in \$foo -> [0..5] :
+#foreach($i in $foo )$i #end
+
+----
+
+Now some use-case examples.  Suppose we want a table to have 10 rows
+
+#set($arr = ["a","b","c"])
+
+<table>
+#foreach($i in $arr)
+<tr><td>$i</td></tr>
+#end
+#foreach($i in [4..10])
+<tr><td>&nbsp;</td></tr>
+#end
+</table>
+=done=

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/range.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/range.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/reference.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/reference.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/reference.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/reference.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,104 @@
+#*
+
+@test reference.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#set($_foo = "bar")
+$_foo
+#if ($_foo.equals("bar"))
+   \$_foo equals "bar" : $_foo
+#end
+
+Late introspection :
+
+$vector.firstElement().length()
+
+
+More stupid reference escaping ...
+
+When it does exist in the context :
+
+#set($foo = "foo")
+$foo
+\$foo
+\$!foo
+$\!foo
+$\\!foo
+\$\!foo
+
+And when it doesn't :
+
+$bar
+\$bar
+
+\$!bar  (because it's just text...)
+
+$\!foo
+$\\!foo
+$\\\!foo
+$\\\\!foo
+\\$\!foo
+
+Misc tests :
+
+[$foo.bar]
+
+
+Test lower case property names 
+
+$provider.Title
+$provider.title
+
+#foreach($i in $provider.vector)
+ $i
+#end
+#foreach($i in $provider.Vector)
+ $i
+#end
+
+Now test if we can use lowercase for propertes in set
+#set($oldtitle = $provider.title)
+Was : $oldtitle
+#set($provider.title = "geir")
+Now : $provider.title
+#set($provider.title = $oldtitle)
+Back : $provider.title
+
+Test what was a bug :
+
+#set($b = 'boy')
+#set($c = 'cat')
+$b${c}.java
+${b}${c}.java
+
+
+More tests :
+
+$provider.title
+$$provider.title
+#$provider.title
+
+$foo.bar#if( $foo ) ($bar) #end
+
+
+Test boolean introspection isFoo()
+
+#if( $boolobj.boolean == true )
+  Correct
+#else
+  Wrong
+#end
+
+
+#if ( $boolobj.notboolean == true )
+   Wrong
+#else
+   Correct
+#end
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/reference.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/reference.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/sample.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/sample.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/sample.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/sample.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,32 @@
+#*
+
+@test sample.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+<html>
+<head><title>Sample velocity page</title></head>
+<body bgcolor="#ffffff">
+<center>
+
+<h2>Hello from velocity!</h2>
+<i>Here's the list of people</i>
+<table cellspacing="0" cellpadding="5" widht="100%">
+    <tr>
+        <td bgcolor="#eeeeee" align="center">
+            Names
+        </td>
+    </tr>
+    #foreach ($name in $provider.Customers)
+    <tr>
+        <td bgcolor="#eeeeee">$name</td>
+    </tr>
+    #end
+</table>
+</center>
+</html>

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/sample.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/sample.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/settest.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/settest.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/settest.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/settest.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+*
+
+@test settest.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+Tests #set parsing funkyness
+*#
+
+#macro( setthing $a )
+  I am setthing : $a
+#end
+
+#set($foo = "bar")
+#set ($foofoo = "barbar")
+
+#setthing( $foo )
+
+SessionBean#setSessionContext

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/settest.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/settest.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/shorthand.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/shorthand.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/shorthand.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/shorthand.vm Tue May 29 15:35:01 2012
@@ -0,0 +1 @@
+<input type="text" name="email" value="$!email">

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/shorthand.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/shorthand.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subclass.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subclass.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subclass.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subclass.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,26 @@
+#**
+
+@test subclass.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+## This is our base class.
+#set($person = $provider.Person)
+
+## This is a subclass of Person
+#set($child = $provider.Child)
+
+#*
+
+showPerson takes a person object, so check to
+see that subclasses of Person work too!
+
+*#
+
+$provider.showPerson($person)
+$provider.showPerson($child)

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subclass.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subclass.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subdir/test.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subdir/test.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subdir/test.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subdir/test.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,2 @@
+This is included text!
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subdir/test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/subdir/test.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/templates.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/templates.properties?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/templates.properties (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/templates.properties Tue May 29 15:35:01 2012
@@ -0,0 +1,41 @@
+# Base names of templates to add to the VelocityTestSuite
+
+test.template.1  = arithmetic
+test.template.2  = array
+test.template.3  = block
+test.template.4  = comment
+test.template.5  = equality
+test.template.6  = escape
+test.template.7  = foreach-array
+test.template.8  = foreach-method
+test.template.9  = foreach-variable
+test.template.10 = formal
+test.template.11 = if
+test.template.12 = logical
+test.template.13 = loop
+test.template.14 = method
+test.template.15 = quotes
+test.template.16 = sample
+test.template.17 = shorthand
+test.template.18 = test
+test.template.19 = diabolical
+test.template.20 = pedantic
+test.template.21 = subclass
+test.template.22 = foreach-map
+test.template.23 = include
+test.template.24 = escape2
+test.template.25 = parse
+test.template.26 = velocimacro
+test.template.27 = reference
+test.template.28 = interpolation
+test.template.29 = vm_test1
+test.template.30 = map
+test.template.31 = literal
+test.template.32 = ifstatement
+test.template.33 = math
+test.template.34 = range
+test.template.35 = get
+test.template.36 = velocimacro2
+test.template.37 = foreach-type
+test.template.38 = foreach-introspect
+test.template.39 = settest

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/templates.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/templates.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.txt Tue May 29 15:35:01 2012
@@ -0,0 +1 @@
+--text--

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,221 @@
+#*
+
+@test test.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+<html>
+<body>
+
+$name
+
+#if ($customer)
+    $customer.Name
+#end
+
+
+## this is a comment.
+
+#if ($customer)
+    this is the first line
+#end
+
+## This is the test bed.
+
+this is testing for wild loose commas , ,
+
+$100
+
+
+#set($foo = "bar")
+
+This is the $foo way.
+
+#if ($foo)
+    This is $bar.
+#elseif ($bar)
+    This is the first elseif!
+#elseif ($foo)
+    This is the second elseif!
+#else
+    This is the else
+#end
+
+#if ($foo)
+    This is the if.
+#else
+    This is the else.
+#end
+
+
+\#set \$foo = "bar"
+
+\$foo   => $foo
+\$foo;  => $foo;
+\$foo.  => $foo.
+\$foo.. => $foo..
+\$foo/  => $foo/
+\$foo"  => $foo"
+\$foo\  => $foo\
+\$foo<  => $foo<
+\$foo-  => $foo-
+\$fooo+ => $fooo+
+\$foo-x => $foo-x
+\$foo$  => $foo$
+
+
+
+#set($iam-cool = "jon")
+$iam-cool
+$!nada nothing here
+
+function preload(imgObj,imgSrc)
+{
+    if (document.images) 
+    {
+        eval(imgObj+' = new Image()')
+        eval(imgObj+'.src = "'+imgSrc+'"')
+    }
+}
+
+function changeImage(layer,imgName,imgObj)
+{
+    if (document.images)
+    {
+        if (document.layers && layer!=null) eval('document.'+layer+'.document.images["'+imgName+'"].src = '+imgObj+'.src')
+        else document.images[imgName].src = eval(imgObj+".src")
+    }
+}
+
+#if ($javascript)
+    function changeImage(layer,imgName,imgObj)
+    {
+        if (document.images)
+        {
+            if (document.layers && layer!=null) eval('document.'+layer+'.document.images["'+imgName+'"].src = '+imgObj+'.src')
+            else document.images[imgName].src = eval(imgObj+".src")
+        }
+    }
+#end
+
+<!-- This is an HTML comment -->
+
+
+$provider2.Title
+
+#set($a = "x")
+$a
+
+#set($b = $a)
+$b
+
+<input type="text" name="email" value="">
+<input type="text" name="email" value="$!schmarg">
+
+
+#set($c = $provider.Title)
+$c
+
+
+#set($d = $provider.getTitle())
+$d
+
+
+#set($provider.Title = "crocodile hunter!")
+
+
+
+$provider.Title
+
+
+
+<!-- look here -->
+
+#set($provider.Title = $d)
+$provider.Title
+
+
+
+#set($provider.Title = $provider.Name)
+$provider.Title
+
+
+#set($provider.Title = $provider.getName())
+$provider.Title
+
+
+
+#set($a = true)
+
+#set($b = false)
+
+#set($provider.State = true)
+
+#set($provider.State = false)
+
+
+
+#if ($provider.StateTrue)
+    This is a property that returns a boolean
+    value of true.
+#end
+
+#if (true)
+    This expression is always (true).
+#end
+
+
+Foreach with a variable.
+
+#foreach ($element in $list)
+    This is $element.
+#end
+
+Foreach with an array.
+
+<table>
+#foreach ($element in $provider.Array)
+    <tr>
+        <td>This is $element</td>
+    </tr>        
+#end
+</table>
+
+
+#foreach ($element in $provider.Vector)
+    This is the $element.
+#end
+
+
+Foreach with a method.
+
+#foreach ($element in $provider.getCustomers())
+    This is $element.
+#end
+
+$10.00
+
+"this is great"
+
+(this is also great)
+
+This is the \#stuff and this
+is the way \#to \#go.
+
+this = that
+
+I am a $provider.getTitle().
+
+#if ($provider.theAPLRules())
+    Yes the APL rules!
+#else
+    It still rules!
+#end
+
+</body>
+</html>

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/test.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,74 @@
+#**
+
+@test velocimacro.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+## inline VM : shows how a tablerow might be generated
+
+#macro( tablerow  $array $color )
+#foreach( $element in $array )
+   <tr><tdi bgcolor=$color>$element</td></tr>
+#end
+#end
+
+Now, use the \#quietnull example from the global library VM_global_library.vm : 
+Now, there should be nothing in the brackets : >#quietnull($nada)<
+
+#set($foo = "hello!")
+Where there should be something here : >#quietnull($foo)<
+
+#set($arr = ["$10.24","$15.32","$12.15"])
+#set($col = "blue")
+
+<table>
+#tablerow( $arr $col)
+</table>
+
+
+Further tests.  The following VMs and non-VM should be properly escaped :
+\#tablerow
+\#quietnull
+\#notavm
+>\\#quietnull($nada)<
+
+Now try to define a new quietnull VM :
+#macro( quietnull $a )
+	QuietNull : $a
+#end
+
+It should have been rejected, as the default is to not let inlines override existing, and there
+should be a message in velocity.log.
+Therefore it should still function normally :
+>#quietnull($foo)<
+>#quietnull($nada)<
+
+We should be able to use argless VMs (and directives....)
+#macro( noargs )
+Hello! I have no args!
+#end
+
+#noargs()
+
+
+And there was a bug where I wasn't getting the params right for the use-instance :
+
+#macro( showarg $i )
+Arg :>$i<
+#end
+
+#showarg( $jdom.getRootElement().getChild("properties").getChild("author").getTextTrim() )
+
+String literals should work as you expect :
+#showarg( "stringliteral")
+
+
+Test boolean args :
+
+#testbool(true)
+#testbool(false)
+- Another fine Velocity Production -

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain