You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2013/01/02 09:48:38 UTC

svn commit: r1427705 - in /tiles/framework/branches/TILES_3_0_X: ./ src/site/apt/tutorial/advanced/wildcard.apt

Author: mck
Date: Wed Jan  2 08:48:38 2013
New Revision: 1427705

URL: http://svn.apache.org/viewvc?rev=1427705&view=rev
Log:
backport doc improvements from Michael Isvy
 `svn merge -c1427704 ^/tiles/framework/trunk`
 http://svn.apache.org/viewvc?view=revision&revision=1427704

Modified:
    tiles/framework/branches/TILES_3_0_X/   (props changed)
    tiles/framework/branches/TILES_3_0_X/src/site/apt/tutorial/advanced/wildcard.apt

Propchange: tiles/framework/branches/TILES_3_0_X/
------------------------------------------------------------------------------
  Merged /tiles/framework/trunk:r1427704

Modified: tiles/framework/branches/TILES_3_0_X/src/site/apt/tutorial/advanced/wildcard.apt
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/src/site/apt/tutorial/advanced/wildcard.apt?rev=1427705&r1=1427704&r2=1427705&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/src/site/apt/tutorial/advanced/wildcard.apt (original)
+++ tiles/framework/branches/TILES_3_0_X/src/site/apt/tutorial/advanced/wildcard.apt Wed Jan  2 08:48:38 2013
@@ -109,24 +109,31 @@ Wildcard support
 <dependency>
 	<groupId>org.apache.tiles</groupId>
 	<artifactId>tiles-extras</artifactId>
-	<version>2.2.2</version>
+	<version>3.0.1</version>
 </dependency>
 ------------------------------------
 
 	If you are using Spring, you should add the 'completeAutoload' attribute to your TilesConfigurer bean.
 
 ------------------------------------
-<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
+<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
 	<property name="completeAutoload" value="true"/>
 </bean>
 ------------------------------------
 
-** Using prefixes for wildcards and Regular Expressions
+** Using prefixes
 
+	Here is an example of prefix using Regular Expressions:
 
-  When using completeAutoload, you can use wildcard expressions and/or regexp. Each of them should be enabled using the dedicated prefix as follows.
+------------------------------------
+<definition name="REGEXP:test\.definition(.*)\.message(.*)" template="/layout{1}.jsp">
+    <put-attribute name="title"  value="This definition has a message: {2}."/>
+    <put-attribute name="header" value="/header.jsp"/>
+    <put-attribute name="body"   value="/body.jsp"/>
+</definition>
+------------------------------------
 
-*** WILDCARD
+	The below sample uses WILDCARD (this prefix is not needed when using wildcards solely, as shown in the 'Default 	Configuration' section).
 
 ------------------------------------
 <definition name="WILDCARD:test.definition*.message*" template="/layout{1}.jsp">
@@ -141,18 +148,8 @@ Wildcard support
 </definition>
 ------------------------------------
 
-  And, if you want to use Regular Expressions:
-
-*** REGEXP
 
-------------------------------------
-<definition name="REGEXP:test\.definition(.*)\.message(.*)" template="/layout{1}.jsp">
-    <put-attribute name="title"  value="This definition has a message: {2}."/>
-    <put-attribute name="header" value="/header.jsp"/>
-    <put-attribute name="body"   value="/body.jsp"/>
-</definition>
-------------------------------------
-*** tiles:insertDefinition
+* tiles:insertDefinition
 
   In both cases, if you insert a definition that matches the definition, for example: