Return-Path:
Delivered-To: apmail-velocity-commits-archive@locus.apache.org
Received: (qmail 31745 invoked from network); 24 Jun 2008 22:47:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
by minotaur.apache.org with SMTP; 24 Jun 2008 22:47:37 -0000
Received: (qmail 11262 invoked by uid 500); 24 Jun 2008 22:47:39 -0000
Delivered-To: apmail-velocity-commits-archive@velocity.apache.org
Received: (qmail 11243 invoked by uid 500); 24 Jun 2008 22:47:39 -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 11234 invoked by uid 99); 24 Jun 2008 22:47:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 15:47:39 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 22:46:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
id D713F23889C0; Tue, 24 Jun 2008 15:47:16 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r671375 - in /velocity/tools/trunk/xdocs: generic.xml
site.dvsl
struts.xml view.xml
Date: Tue, 24 Jun 2008 22:47:16 -0000
To: commits@velocity.apache.org
From: nbubna@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080624224716.D713F23889C0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
Author: nbubna
Date: Tue Jun 24 15:47:16 2008
New Revision: 671375
URL: http://svn.apache.org/viewvc?rev=671375&view=rev
Log:
make it easier to create javadoc links in documents
Modified:
velocity/tools/trunk/xdocs/generic.xml
velocity/tools/trunk/xdocs/site.dvsl
velocity/tools/trunk/xdocs/struts.xml
velocity/tools/trunk/xdocs/view.xml
Modified: velocity/tools/trunk/xdocs/generic.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.xml?rev=671375&r1=671374&r2=671375&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic.xml (original)
+++ velocity/tools/trunk/xdocs/generic.xml Tue Jun 24 15:47:16 2008
@@ -67,50 +67,50 @@
- - AlternatorTool
- - For creating Alternators
+
-
+ - For creating s
to easily alternate over a set of values.
- - ClassTool
+
-
- For simplifying reflective lookup of information about
Classes and their fields, methods and constructors.
- - ContextTool
+
-
- For convenient access to Context data and meta-data.
- - ConversionTool
+
-
- For converting String values to richer object types.
- - DateTool
+
-
&
- ComparisonDateTool
+
- For manipulating, formatting, and comparing dates.
- - DisplayTool
+
-
- For controlling display of references (e.g. truncating values,
"pretty printing" lists, and displaying alternates when a reference is null).
- - EscapeTool
+
-
- For common escaping needs in Velocity templates (e.g. escaping
html, xml, javascript etc.)
- - FieldTool
+
-
- For (easy) access to static fields in a class, such as string
constants.
- - LoopTool
+
-
- A convenience tool to use with #foreach loops. It wraps a list
with a custom iterator to provide greater control, allowing loops
to end early, skip ahead and more.
- - LinkTool
+
-
- For creating and manipulating URIs and URLs. The API for this tool is
designed to closely resemble that of the VelocityView tool of the same name.
- - ListTool
+
-
- For working with arrays and lists, treats both transparently
the same.
- - MathTool
+
-
- For performing math functions.
- - NumberTool
+
-
- For formatting and converting numbers.
- - RenderTool
+
-
- To evaluate and render arbitrary strings of VTL, including
recursive rendering.
- - ResourceTool
+
-
- For simplified access to ResourceBundles for
internationalization or other dynamic content needs.
- - SortTool
+
-
- Used to sort collections (or arrays, iterators, etc) on
any arbitary set of properties exposed by the objects contained
within the collection.
Modified: velocity/tools/trunk/xdocs/site.dvsl
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/site.dvsl?rev=671375&r1=671374&r2=671375&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/site.dvsl (original)
+++ velocity/tools/trunk/xdocs/site.dvsl Tue Jun 24 15:47:16 2008
@@ -283,8 +283,8 @@
*#
#match( "todo" )
- This is still unfinished.
- Help is welcome!
+ This is unfinished.
+ You can help fix that!
#set( $todo = "$!node.copy()" )
#if( $todo != '' )
TODO: $todo
@@ -292,7 +292,6 @@
#end
-
#*
* process a 'sourcecode' block.
*#
@@ -326,7 +325,50 @@
#end
-#match("*")
-$node.copy()
+#*
+ * process a javadoc element
+ *#
+#match( 'javadoc' )##
+#if( $attrib.package )
+ #set( $package = $attrib.package )
+ #if( !$package.startsWith('org.apache.velocity.tools') )
+ #set( $package = "org.apache.velocity.tools.$package" )
+ #end
+#else
+ #set( $package = 'org.apache.velocity.tools' )
+#end
+#set( $href = "javadoc/$package.replace('.','/')/${attrib.name}.html" )
+#set( $content = "$!node.value()" )
+#if( $content == '' )
+ #if( $attrib.full )
+ #set( $content = $package + '.' + $attrib.name )
+ #else
+ #set( $content = $attrib.name )
+ #end
+#end
+$content
+#end
+
+#*
+ * macro to navigate document and replace tags
+ *#
+#macro( digFor $name $tag )
+#set( $kids = $tag.children() )
+#if( "$!tag.name()" == $name )
+ $context.applyTemplates($tag)
+#elseif( $kids.isEmpty() )
+ $tag.copy()
+#elseif( $tag.selectNodes("$name|*//$name").isEmpty() )
+ $tag.copy()
+#else
+ <$tag.name()#foreach( $key in $attrib.keySet() ) $key="$!attrib.get($key)"#end>
+ #foreach( $kid in $kids )
+ #digFor( $name $kid )
+ #end
+ $tag.name()>
+#end
#end
+#match("*")
+#digFor( 'javadoc' $node )
+#end
Modified: velocity/tools/trunk/xdocs/struts.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/struts.xml?rev=671375&r1=671374&r2=671375&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/struts.xml (original)
+++ velocity/tools/trunk/xdocs/struts.xml Tue Jun 24 15:47:16 2008
@@ -99,7 +99,7 @@