Author: ate Date: Tue Feb 20 17:20:43 2007 New Revision: 509857 URL: http://svn.apache.org/viewvc?view=rev&rev=509857 Log: Rolling back previous fix for JS2-462: Need to clean up Velocity logs, too many warnings and some errors even ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0
Turns out there are many (potential) problems with recursive Velocity macros... Velocity does have a (still undocumented) #local directive which is supposed to solve those problems. But... with the current version (1.4) there are still problems with it although they should be solved in the next version (1.5) See: http://issues.apache.org/jira/browse/VELOCITY-24 For the time being, better be save than sorry so we will have to keep up with the above error message a while longer. Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/decorator-macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -125,12 +125,6 @@ </div> #end -#* dummy "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro - to prevent "ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0". - Seemingly the Velocity macro parser is doing a lookup call during parsing for the self-calling includeNestedLinksWithIconNavigation macro -*# -#macro (includeNestedLinksWithIconNavigation) #end - #* include nested menu links navigation component *# #macro (includeNestedLinksWithIconNavigation $_menu $_orientation) #set($menuTitle = $_menu.getTitle($preferedLocale)) Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -1,9 +1,3 @@ -#* dummy "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro - to prevent "ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0". - Seemingly the Velocity macro parser is doing a lookup call during parsing for the self-calling includeNestedLinksWithIconNavigation macro -*# -#macro (includeNestedLinksWithIconNavigation) #end - #* include potentially nested links navigation component *# #macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix) <div> Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -7,12 +7,6 @@ #set($BOTTOM_TO_TOP = "BottomToTop") #end -#* dummy "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro - to prevent "ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0". - Seemingly the Velocity macro parser is doing a lookup call during parsing for the self-calling includeNestedLinksWithIconNavigation macro -*# -#macro (includeNestedLinksWithIconNavigation) #end - #* include potentially nested links navigation component *# #macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix $_orientation) <div> Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -100,8 +100,6 @@ </div> #end -#* "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro *# -#macro (includeNestedLinksWithIconNavigation) #end #* include nested menu links navigation component *# #macro (includeNestedLinksWithIconNavigation $_menu $_orientation) #set($menuTitle = $_menu.getTitle($preferedLocale)) Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -119,12 +119,6 @@ </div> #end -#* dummy "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro - to prevent "ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0". - Seemingly the Velocity macro parser is doing a lookup call during parsing for the self-calling includeNestedLinksWithIconNavigation macro -*# -#macro (includeNestedLinksWithIconNavigation) #end - #* include nested menu links navigation component *# #macro (includeNestedLinksWithIconNavigation $_menu $_orientation) #set($menuTitle = $_menu.getTitle($preferedLocale)) Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -119,12 +119,6 @@ </div> #end -#* dummy "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro - to prevent "ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0". - Seemingly the Velocity macro parser is doing a lookup call during parsing for the self-calling includeNestedLinksWithIconNavigation macro -*# -#macro (includeNestedLinksWithIconNavigation) #end - #* include nested menu links navigation component *# #macro (includeNestedLinksWithIconNavigation $_menu $_orientation) #set($menuTitle = $_menu.getTitle($preferedLocale)) Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm?view=diff&rev=509857&r1=509856&r2=509857 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm (original) +++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm Tue Feb 20 17:20:43 2007 @@ -125,12 +125,6 @@ </div> #end -#* dummy "forward" reference definition of the real includeNestedLinksWithIconNavigation($_menu $_orientation) macro - to prevent "ERROR velocity - VM #includeNestedLinksWithIconNavigation: error : too few arguments to macro. Wanted 2 got 0". - Seemingly the Velocity macro parser is doing a lookup call during parsing for the self-calling includeNestedLinksWithIconNavigation macro -*# -#macro (includeNestedLinksWithIconNavigation) #end - #* include nested menu links navigation component *# #macro (includeNestedLinksWithIconNavigation $_menu $_orientation) #set($menuTitle = $_menu.getTitle($preferedLocale)) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
