Return-Path: Delivered-To: apmail-velocity-commits-archive@locus.apache.org Received: (qmail 3127 invoked from network); 22 Aug 2007 16:32:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Aug 2007 16:32:14 -0000 Received: (qmail 9812 invoked by uid 500); 22 Aug 2007 16:32:11 -0000 Delivered-To: apmail-velocity-commits-archive@velocity.apache.org Received: (qmail 9784 invoked by uid 500); 22 Aug 2007 16:32:11 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 9775 invoked by uid 99); 22 Aug 2007 16:32:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2007 09:32:11 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2007 16:32:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A55801A981D; Wed, 22 Aug 2007 09:31:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r568691 [2/2] - in /velocity/engine/trunk: src/java/org/apache/velocity/ src/java/org/apache/velocity/context/ src/java/org/apache/velocity/runtime/directive/ src/java/org/apache/velocity/runtime/parser/ src/java/org/apache/velocity/runtime... Date: Wed, 22 Aug 2007 16:31:34 -0000 To: commits@velocity.apache.org From: wglass@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070822163153.A55801A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: velocity/engine/trunk/test/macrolibs/compare/vm_library_local.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/macrolibs/compare/vm_library_local.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/macrolibs/compare/vm_library_local.cmp (added) +++ velocity/engine/trunk/test/macrolibs/compare/vm_library_local.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,18 @@ +This is a test file for loading macro libs programatically + +call foo +24 +no macro definition +#abc(2) This is a test file for loading macro libs programatically + +call foo +86 +no macro definition +#abc(2) This is a test file for loading macro libs programatically + +call foo +#foo(1) +#bar(2) + +no macro definition +#abc(2) \ No newline at end of file Propchange: velocity/engine/trunk/test/macrolibs/compare/vm_library_local.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/macrolibs/compare/vm_library_local.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/macrolibs/vm_library.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/macrolibs/vm_library.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/macrolibs/vm_library.vm (added) +++ velocity/engine/trunk/test/macrolibs/vm_library.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,8 @@ +This is a test file for loading macro libs programatically + +call foo +#foo(1) +#bar(2) + +no macro definition +#abc(2) Propchange: velocity/engine/trunk/test/macrolibs/vm_library.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/macrolibs/vm_library.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/macrolibs/vm_library1.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/macrolibs/vm_library1.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/macrolibs/vm_library1.vm (added) +++ velocity/engine/trunk/test/macrolibs/vm_library1.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,7 @@ +#macro(bar $a) +#if($a)#set($a = $a + $a)$a#end +#end + +#macro(foo $a) +#if($a)#set($a = $a + 1)$a#end +#end Propchange: velocity/engine/trunk/test/macrolibs/vm_library1.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/macrolibs/vm_library1.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/macrolibs/vm_library2.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/macrolibs/vm_library2.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/macrolibs/vm_library2.vm (added) +++ velocity/engine/trunk/test/macrolibs/vm_library2.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,7 @@ +#macro( bar $a) +#if($a)#set($a = $a + $a + $a)$a#end +#end + +#macro( foo $a) +#if($a)#set($a = $a * 8)$a#end +#end Propchange: velocity/engine/trunk/test/macrolibs/vm_library2.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/macrolibs/vm_library2.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/macrolibs/vm_library_global.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/macrolibs/vm_library_global.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/macrolibs/vm_library_global.vm (added) +++ velocity/engine/trunk/test/macrolibs/vm_library_global.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,8 @@ +This is a test file for loading macro libs programatically + +call foo +#foo(1) +#bar(2) + +no macro definition +#abc(2) \ No newline at end of file Propchange: velocity/engine/trunk/test/macrolibs/vm_library_global.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/macrolibs/vm_library_global.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/macrolibs/vm_library_local.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/macrolibs/vm_library_local.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/macrolibs/vm_library_local.vm (added) +++ velocity/engine/trunk/test/macrolibs/vm_library_local.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,8 @@ +This is a test file for loading macro libs programatically + +call foo +#foo(1) +#bar(2) + +no macro definition +#abc(2) \ No newline at end of file Propchange: velocity/engine/trunk/test/macrolibs/vm_library_local.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/macrolibs/vm_library_local.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +2 4 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1b.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1b.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1b.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1b.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +8 6 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1b.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_1b.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +2 4 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2b.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2b.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2b.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2b.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +8 6 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2b.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_2b.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +2 4 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3b.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3b.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3b.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3b.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +8 6 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3b.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_3b.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +2 4 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4b.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4b.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4b.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4b.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ + +8 6 + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4b.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro1_4b.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/compare/parseMacro2.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/compare/parseMacro2.cmp?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/compare/parseMacro2.cmp (added) +++ velocity/engine/trunk/test/parsemacros/compare/parseMacro2.cmp Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ +#foo(1) #bar(2) + + Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro2.cmp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/compare/parseMacro2.cmp ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/parseMacro1.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/parseMacro1.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/parseMacro1.vm (added) +++ velocity/engine/trunk/test/parsemacros/parseMacro1.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,4 @@ +#parse($includefile) +#foo(1) #bar(2) + + Propchange: velocity/engine/trunk/test/parsemacros/parseMacro1.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/parseMacro1.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/parseMacro2.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/parseMacro2.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/parseMacro2.vm (added) +++ velocity/engine/trunk/test/parsemacros/parseMacro2.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,3 @@ +#foo(1) #bar(2) + + Propchange: velocity/engine/trunk/test/parsemacros/parseMacro2.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/parseMacro2.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/vm_library1.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/vm_library1.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/vm_library1.vm (added) +++ velocity/engine/trunk/test/parsemacros/vm_library1.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,7 @@ +#macro(bar $a) +#if($a)#set($a = $a + $a)$a#end +#end + +#macro(foo $a) +#if($a)#set($a = $a + 1)$a#end +#end Propchange: velocity/engine/trunk/test/parsemacros/vm_library1.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/vm_library1.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision Added: velocity/engine/trunk/test/parsemacros/vm_library2.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/test/parsemacros/vm_library2.vm?rev=568691&view=auto ============================================================================== --- velocity/engine/trunk/test/parsemacros/vm_library2.vm (added) +++ velocity/engine/trunk/test/parsemacros/vm_library2.vm Wed Aug 22 09:31:31 2007 @@ -0,0 +1,7 @@ +#macro( bar $a) +#if($a)#set($a = $a + $a + $a)$a#end +#end + +#macro( foo $a) +#if($a)#set($a = $a * 8)$a#end +#end Propchange: velocity/engine/trunk/test/parsemacros/vm_library2.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/test/parsemacros/vm_library2.vm ------------------------------------------------------------------------------ svn:keywords = Id Author Date Revision