Changeset 830
- Timestamp:
- 2008-11-26 10:01:14 (4 years ago)
- Location:
- trunk/universe/kauri-template/src
- Files:
-
- 4 edited
-
main/java/org/kauriproject/template/MacroBlock.java (modified) (1 diff)
-
test/resources/org/kauriproject/template/inherit.xml (modified) (1 diff)
-
test/resources/org/kauriproject/template/inherit_multiple_result.xml (modified) (1 diff)
-
test/resources/org/kauriproject/template/inherit_result.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/universe/kauri-template/src/main/java/org/kauriproject/template/MacroBlock.java
r646 r830 93 93 callerRegistry.put(getName(), null); 94 94 95 return next .executeAndProceed(context, result);95 return next; 96 96 } 97 97 -
trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/inherit.xml
r686 r830 15 15 </ktl:block> 16 16 </div> 17 <ktl:macro name="mac"> 18 <p>macro defined in child</p> 19 </ktl:macro> 20 <ktl:callMacro name="mac" /> 17 21 </ktl:block> 18 22 </body> -
trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/inherit_multiple_result.xml
r693 r830 16 16 <p>overriding block defined in parent</p> 17 17 </div> 18 <p>macro defined in child</p> 18 19 <p>trailing stuff from base</p> 19 20 </body> -
trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/inherit_result.xml
r686 r830 12 12 <p>block defined in child</p> 13 13 </div> 14 <p>macro defined in child</p> 14 15 <p>trailing stuff from base</p> 15 16 </body>
Note: See TracChangeset
for help on using the changeset viewer.