tiles-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r931642 - in /tiles/sandbox/trunk/tiles3: ./ src/site/apt/tutorial/integration/velocity.apt tiles-freemarker/pom.xml tiles-test-pom/tiles-test/ tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml tiles-velocity/src/site/
Date Wed, 07 Apr 2010 18:59:55 GMT
Author: apetrelli
Date: Wed Apr  7 18:59:54 2010
New Revision: 931642

URL: http://svn.apache.org/viewvc?rev=931642&view=rev
Log:
TILES-496
Merge from trunk to tiles 3 sandbox.
Applied patch by Mck SembWever.

Removed:
    tiles/sandbox/trunk/tiles3/tiles-velocity/src/site/
Modified:
    tiles/sandbox/trunk/tiles3/   (props changed)
    tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt
    tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml
    tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/   (props changed)
    tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
  (props changed)

Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  7 18:59:54 2010
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637

Modified: tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt?rev=931642&r1=931641&r2=931642&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt Wed Apr  7 18:59:54
2010
@@ -138,4 +138,26 @@ $tilesAlt.endAttributeContext()
 #end
 ----------------------------------
 
+  Other <<<tiles>>> directives are:
+  
+      * <<<getAsString(String attributeName)>>> - get the value of named
attribute as string.
+
+      * <<<importAttribute(String attributeName, String toName)>>> - import
the named attribute into the scope of
+  	template context under the (optional) custom name.
+
+      * <<<insertAttribute(String attributeName)>>> - inserts given attribute
in the output in its own context.
+        If this is a string a string is printed, if this is a definition - it is included
in the output.
+
+      * <<<insertAttribute(String attributeName, boolean ownContext)>>>
- inserts given attribute in the output.
+        If this is a string a string is printed, if this is a definition - it is included
in the output. You can specify whether
+        a separate context is created for rendering the definition - in this case variables
with duplicate names
+        will not be inherited from the parent definition
+
+      * <<<insertDefinition(String definitionName)>>> - renders a definition
in its own context.
+
+      * <<<insertDefinition(String definitionName, boolean ownContext)>>>
- inserts definition, optionally in the shared context.
+
+      * <<<insertTemplate(String template)>>> - inserts a named page, equivalent
to Velocity's <<<#parse>>>.
+
+
   For details about the tool and directives see the {{{../../apidocs/index.html}Javadocs}}.

Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml?rev=931642&r1=931641&r2=931642&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml Wed Apr  7 18:59:54 2010
@@ -26,7 +26,7 @@
   <groupId>org.apache.tiles</groupId>
   <artifactId>tiles-freemarker</artifactId>
   <name>Tiles - FreeMarker Support</name>
-  <description>Support for FreeMarker in Tiles</description>
+  <description>Support for FreeMarker in Tiles 2. For more read http://tiles.apache.org/framework/tutorial/integration/freemarker.html</description>
   <parent>
       <artifactId>tiles-parent</artifactId>
       <groupId>org.apache.tiles</groupId>

Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  7 18:59:54 2010
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637
 /tiles/sandbox/trunk/tiles-test:740289
 /tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891

Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  7 18:59:54 2010
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552,921998
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637



Mime
View raw message