You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/03/11 00:24:25 UTC
svn commit: r752303 [1/2] - in /tiles/framework/trunk/tiles-test: ./
src/main/java/org/apache/tiles/test/factory/
src/main/java/org/apache/tiles/test/velocity/
src/main/resources/org/apache/tiles/ src/main/webapp/
src/main/webapp/WEB-INF/ src/main/weba...
Author: apetrelli
Date: Tue Mar 10 23:24:21 2009
New Revision: 752303
URL: http://svn.apache.org/viewvc?rev=752303&view=rev
Log:
TILES-378
First step of merge.
Added:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/velocity/
- copied from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/velocity/
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/velocity/ExceptionTool.java
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/velocity/ExceptionTool.java
tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/velocity-classpath-defs.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/velocity-classpath-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/tools.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/
- copied from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties (with props)
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs-1.1.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-defs-1.1.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_GB.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-defs_en_GB.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_US.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-defs_en_US.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_fr.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-defs_fr.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_it.xml
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/velocity/tiles-defs_it.xml
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/
- copied from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/alternate-header.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/alternate-header.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/body.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/body.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/classpath.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/classpath.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/defaultlocale.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/defaultlocale.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/errorInclude.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/errorInclude.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/exception.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/exception.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/header.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/header.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layoutOne.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutOne.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layoutTwo.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutTwo.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_alt_title.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_alt_title.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_closebody.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_closebody.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_default.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_default.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_flush.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_flush.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_ignore.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_ignore.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_list.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_list.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_nobody.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_nobody.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_override.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_override.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_preparer.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_preparer.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/layout_roles.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_roles.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/override.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/override.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putallattributeslayout.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/putattributeslayout.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putattributeslayout.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/selectlocale.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/selectlocale.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testdecorationfilter.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdecorationfilter.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testdef.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testdef_extend.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_extend.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_list_inherit.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testdef_preparer.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_preparer.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testimportattribute.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_all.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_inherit.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_classpath.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_db.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_exception.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_flush.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_freemarker.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_freemarker.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_ignore.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_inline.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_old.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_openbody.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_template.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_role.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_cascaded.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_cascaded_overridden.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_overridden.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_cascaded_template.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_template.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_el.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_el_singleeval.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el_singleeval.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_flush.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_flush.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_reversed.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_reversed_explicit.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed_explicit.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testput_servlet.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_servlet.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testputlist.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testputlist_cascaded.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testputlist_inherit.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_inherit.vm
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testsetcurrentcontainer.vm
- copied unchanged from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/
- copied from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionELTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionReversedExplicitTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionReversedExplicitTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/DefinitionTagExtendTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagExtendTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/DefinitionTagListInheritTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagListInheritTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/DefinitionTagPreparerTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagPreparerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/DefinitionTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ImportAttributeTagAllTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ImportAttributeTagAllTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ImportAttributeTagInheritTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ImportAttributeTagInheritTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ImportAttributeTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ImportAttributeTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/LocalizationTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/LocalizationTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutListCascadedTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutListCascadedTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutListTagInheritTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutListTagInheritTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutListTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutListTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagCascadedTemplateTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagCascadedTemplateTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagCascadedTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagCascadedTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagFlushTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagFlushTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagNestedDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagNestedDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagReversedExplicitTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagReversedExplicitTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagReversedTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagReversedTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagWithELTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagWithELTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/PutTagWithServletTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagWithServletTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/SetCurrentContainerTagTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/SetCurrentContainerTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/TilesDefinitionFilterTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/TilesDefinitionFilterTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/TilesDispatchServletTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/TilesDispatchServletTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/WelcomePageTest.html
- copied, changed from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/WelcomePageTest.html
Modified:
tiles/framework/trunk/tiles-test/ (props changed)
tiles/framework/trunk/tiles-test/pom.xml
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp
tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
Propchange: tiles/framework/trunk/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 10 23:24:21 2009
@@ -1,2 +1,2 @@
/tiles/sandbox/trunk/tiles-test:740289
-/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038
+/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Tue Mar 10 23:24:21 2009
@@ -53,6 +53,11 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tiles-velocity</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java Tue Mar 10 23:24:21 2009
@@ -44,7 +44,7 @@
/**
* The number of URLs to load..
*/
- private static final int URL_COUNT = 2;
+ private static final int URL_COUNT = 3;
/** {@inheritDoc} */
@Override
@@ -54,6 +54,7 @@
try {
urls.add(applicationContext.getResource("/WEB-INF/tiles-alt-defs.xml"));
urls.add(applicationContext.getResource("/WEB-INF/freemarker/tiles-alt-defs.xml"));
+ urls.add(applicationContext.getResource("/WEB-INF/velocity/tiles-alt-defs.xml"));
} catch (IOException e) {
throw new DefinitionsFactoryException(
"Cannot load definition URLs", e);
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java Tue Mar 10 23:24:21 2009
@@ -36,6 +36,8 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.test.definition.dao.LocaleDbDefinitionDAO;
+import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
+
/**
* Test alternate Tiles container factory that uses a DB to store definitions.
@@ -78,6 +80,9 @@
registerRequestContextFactory(
FreeMarkerTilesRequestContextFactory.class.getName(),
factories, contextFactory);
+ registerRequestContextFactory(
+ VelocityTilesRequestContextFactory.class.getName(),
+ factories, contextFactory);
contextFactory.setFactories(factories);
}
}
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java Tue Mar 10 23:24:21 2009
@@ -53,6 +53,8 @@
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.test.evaluator.el.MultiversionExpressionFactoryFactory;
import org.apache.tiles.test.renderer.ReverseStringAttributeRenderer;
+import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
+
/**
* Test Tiles container factory to customize Tiles behaviour.
@@ -91,6 +93,9 @@
registerRequestContextFactory(
FreeMarkerTilesRequestContextFactory.class.getName(),
factories, contextFactory);
+ registerRequestContextFactory(
+ VelocityTilesRequestContextFactory.class.getName(),
+ factories, contextFactory);
contextFactory.setFactories(factories);
}
@@ -153,6 +158,8 @@
"classpath:/org/apache/tiles/classpath-defs.xml"));
urls.add(applicationContext.getResource(
"classpath:/org/apache/tiles/freemarker-classpath-defs.xml"));
+ urls.add(applicationContext.getResource(
+ "classpath:/org/apache/tiles/velocity-classpath-defs.xml"));
} catch (IOException e) {
throw new DefinitionsFactoryException(
"Cannot load definition URLs", e);
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Added: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties?rev=752303&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties Tue Mar 10 23:24:21 2009
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# ----------------------------------------------------------------------------
+# These are the default properties for the
+# Velocity Runtime. These values are used when
+# Runtime.init() is called, and when Runtime.init(properties)
+# fails to find the specificed properties file.
+# ----------------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------------
+# R U N T I M E L O G
+# ----------------------------------------------------------------------------
+# Velocity uses the Servlet APIs logging facilites.
+
+# ----------------------------------------------------------------------------
+# This controls if Runtime.error(), info() and warn() messages include the
+# whole stack trace. The last property controls whether invalid references
+# are logged.
+# ----------------------------------------------------------------------------
+
+runtime.log.invalid.reference = true
+
+
+# ----------------------------------------------------------------------------
+# T E M P L A T E E N C O D I N G
+# ----------------------------------------------------------------------------
+
+input.encoding=ISO-8859-1
+output.encoding=ISO-8859-1
+
+
+# ----------------------------------------------------------------------------
+# F O R E A C H P R O P E R T I E S
+# ----------------------------------------------------------------------------
+# These properties control how the counter is accessed in the #foreach
+# directive. By default the reference $velocityCount will be available
+# in the body of the #foreach directive. The default starting value
+# for this reference is 1.
+# ----------------------------------------------------------------------------
+
+directive.foreach.counter.name = velocityCount
+directive.foreach.counter.initial.value = 1
+
+
+# ----------------------------------------------------------------------------
+# I N C L U D E P R O P E R T I E S
+# ----------------------------------------------------------------------------
+# These are the properties that governed the way #include'd content
+# is governed.
+# ----------------------------------------------------------------------------
+
+directive.include.output.errormsg.start = <!-- include error :
+directive.include.output.errormsg.end = see error log -->
+
+
+# ----------------------------------------------------------------------------
+# P A R S E P R O P E R T I E S
+# ----------------------------------------------------------------------------
+
+directive.parse.max.depth = 10
+
+
+# ----------------------------------------------------------------------------
+# VELOCIMACRO PROPERTIES
+# ----------------------------------------------------------------------------
+# global : name of default global library. It is expected to be in the regular
+# template path. You may remove it (either the file or this property) if
+# you wish with no harm.
+# ----------------------------------------------------------------------------
+# dev-changes by Marino
+webapp.resource.loader.cache = true
+webapp.resource.loader.modificationCheckInterval = 5
+velocimacro.library.autoreload = false
+velocimacro.library = /WEB-INF/VM_global_library.vm
+
+velocimacro.permissions.allow.inline = true
+velocimacro.permissions.allow.inline.to.replace.global = false
+velocimacro.permissions.allow.inline.local.scope = false
+
+velocimacro.context.localscope = false
+
+# ----------------------------------------------------------------------------
+# INTERPOLATION
+# ----------------------------------------------------------------------------
+# turn off and on interpolation of references and directives in string
+# literals. ON by default :)
+# ----------------------------------------------------------------------------
+runtime.interpolate.string.literals = true
+
+
+# ----------------------------------------------------------------------------
+# RESOURCE MANAGEMENT
+# ----------------------------------------------------------------------------
+# Allows alternative ResourceManager and ResourceCache implementations
+# to be plugged in.
+# ----------------------------------------------------------------------------
+resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl
+resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml Tue Mar 10 23:24:21 2009
@@ -73,6 +73,12 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>Tiles Decoration Filter</filter-name>
+ <url-pattern>/velocity/testdecorationfilter.vm</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>Security Wrapping Filter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
@@ -115,6 +121,28 @@
</servlet>
<servlet>
+ <servlet-name>velocity</servlet-name>
+ <servlet-class>org.apache.velocity.tools.view.VelocityViewServlet</servlet-class>
+
+ <!--
+ Unless you plan to put your tools.xml and velocity.properties under
+ different folders or give them different names, then these two
+ init-params are unnecessary. The VelocityViewServlet will
+ automatically look for these files in the following locations.
+ -->
+ <init-param>
+ <param-name>org.apache.velocity.toolbox</param-name>
+ <param-value>/WEB-INF/tools.xml</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>org.apache.velocity.properties</param-name>
+ <param-value>/WEB-INF/velocity.properties</param-value>
+ </init-param>
+ </servlet>
+
+
+ <servlet>
<servlet-name>Tiles Dispatch Servlet</servlet-name>
<servlet-class>org.apache.tiles.web.util.TilesDispatchServlet</servlet-class>
</servlet>
@@ -160,6 +188,14 @@
<param-value>freemarker.test.localized.definition</param-value>
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>selectLocaleServletVelocity</servlet-name>
+ <servlet-class>org.apache.tiles.test.servlet.SelectLocaleServlet</servlet-class>
+ <init-param>
+ <param-name>org.apache.tiles.test.servlet.ServletConfig.DEFINITION_NAME</param-name>
+ <param-value>velocity.test.localized.definition</param-value>
+ </init-param>
+ </servlet>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
@@ -190,6 +226,16 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>selectLocaleServletVelocity</servlet-name>
+ <url-pattern>/velocity/servlets/selectLocaleServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>velocity</servlet-name>
+ <url-pattern>*.vm</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>Tiles Dispatch Servlet</servlet-name>
<url-pattern>*.tiles</url-pattern>
</servlet-mapping>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Tue Mar 10 23:24:21 2009
@@ -195,4 +195,86 @@
<a href="freemarker/testinsertdefinition_db.ftl">FreeMarker: Test Insert Configured Definition from DB</a><br/>
<a href="freemarker/testinsertdefinition_extended_db.ftl">FreeMarker: Test Insert Extended Configured Definition from DB</a><br/>
+
+ <h1>Velocity-based tests</h1>
+
+ <h2>Features in Tiles 2.0.x</h2>
+
+ <h3>Standard Render/Attribute Tests</h3>
+ <a href="velocity/testinsertdefinition.vm">Velocity: Test Insert Configured Definition</a><br/>
+ <a href="velocity/testinsertdefinition_ignore.vm">Velocity: Test Insert Configured Definition with Ignore</a><br/>
+ <a href="velocity/testinsertdefinition_flush.vm">Velocity: Test Insert Configured Definition with Flush</a><br/>
+ <a href="velocity/testinsertdefinition_preparer.vm">Velocity: Test Insert Configured Definition with Preparer</a><br/>
+ <a href="velocity/testinsertdefinition_preparer_configured.vm">Velocity: Test Insert Configured Definition with Preparer configured in the definition itself</a><br/>
+ <a href="velocity/testinsertdefinition_classpath.vm">Velocity: Test Insert Configured Classpath Definition</a><br/>
+ <a href="velocity/testinsertdefinition_override.vm">Velocity: Test Insert Configured Definition with an overridden content</a><br/>
+ <a href="velocity/testinsertdefinition_override_and_not.vm">Velocity: Test Insert Configured Definition with an overridden content and one with original content</a><br/>
+ <a href="velocity/testinsertdefinition_inline.vm">Velocity: Test Insert Configured Definition with an inline content</a><br/>
+ <a href="velocity/testinsertdefinition_composite.vm">Velocity: Test Insert Configured Definition that contains another definition inside</a><br/>
+ <a href="velocity/testinsertdefinition_exception.vm">Velocity: Test Insert Configured Definition with an exception in an attribute page</a><br/>
+ <a href="velocity/testinsertdefinition_openbody.vm">Velocity: Test Insert Configured Definition with Open Body</a><br/>
+ <a href="velocity/testput.vm">Velocity: Test Put Tag</a><br/>
+ <a href="velocity/testput_flush.vm">Velocity: Test Put Tag with Flush</a><br/>
+ <a href="velocity/testput_el.vm">Velocity: Test Put Tag using EL</a><br/>
+ <a href="velocity/testput_servlet.vm">Velocity: Test Put Tag using a servlet mapping as a template</a><br/>
+ <a href="velocity/testputlist.vm">Velocity: Test Put List Tag</a><br/>
+ <a href="velocity/testimportattribute.vm">Velocity: Test importAttribute Tag</a><br/>
+ <a href="velocity/testimportattribute_all.vm">Velocity: Test importAttribute Tag with no name</a><br/>
+ <a href="velocity/testdecorationfilter.vm">Velocity: Test Tiles Definition Filter</a><br/>
+ <a href="velocity.testdispatchservlet.tiles">Velocity: Test Tiles Dispatch Servlet</a><br/>
+ <a href="velocity/selectlocale.vm">Velocity: Test Localization</a><br/>
+
+ <h3>Mutable Container Tests</h3>
+ <a href="velocity/testdef.vm">Velocity: Test Definition Tag</a><br/>
+ <a href="velocity/testdef_extend.vm">Velocity: Test Definition Tag extending configured and custom definitions</a><br/>
+ <a href="velocity/testdef_preparer.vm">Velocity: Test Definition Tag with Preparer</a><br/>
+ <a href="velocity/testinsertdefinition_composite_tags_includes_configured.vm">Velocity: Test Insert Definition that contains another definition inside (configured via tiles-defs.xml) using JSP tags</a><br/>
+ <a href="velocity/testinsertdefinition_composite_tags.vm">Velocity: Test Insert Definition that contains another definition inside using JSP tags</a><br/>
+ <a href="velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm">Velocity: Test Insert Definition that contains another definition inside (configured via tiles-defs.xml) using JSP tags without types</a><br/>
+ <a href="velocity/testinsertdefinition_composite_tags_notype.vm">Velocity: Test Insert Definition that contains another definition inside using JSP tags without types</a><br/>
+
+ <h3>Roles Verification tests</h3>
+ <a href="velocity/testinsertdefinition_role.vm">Velocity: Test Insert Configured Definition with Specified Role</a><br/>
+ <a href="velocity/testinsertdefinition_role_tag.vm">Velocity: Test Insert Configured Definition with Specified Role in Tag</a><br/>
+ <a href="velocity/testinsertdefinition_attribute_roles.vm">Velocity: Test Insert Configured Definition with Attribute that have Roles</a><br/>
+ <a href="velocity/testinsertdefinition_attribute_roles_tags.vm">Velocity: Test Insert Configured Definition with Attribute that have Roles in Tags</a><br/>
+
+ <h2>Features in Tiles 2.1.x</h2>
+
+ <h3>Standard Render/Attribute Tests</h3>
+ <a href="velocity/testinsertdefinition_override_template.vm">Velocity: Test Insert Configured Definition with an overridden template</a><br/>
+ <a href="velocity/testinsertdefinition_old.vm">Velocity: Test Insert Configured Definition in Old Format</a><br/>
+ <a href="velocity/testinsertdefinition_cascaded.vm">Velocity: Test Insert Configured Cascaded Definition</a><br/>
+ <a href="velocity/testinsertdefinition_cascaded_overridden.vm">Velocity: Test Insert Configured Cascaded Definition with Override</a><br/>
+ <a href="velocity/testinsertdefinition_cascaded_template.vm">Velocity: Test Insert Configured Cascaded Definition with Template</a><br/>
+ <a href="velocity/testinsertdefinition_cascaded_list.vm">Velocity: Test Insert Configured Cascaded Definition with List</a><br/>
+ <a href="velocity/testinsertdefinition_reversed.vm">Velocity: Test Insert Configured Definition with Reversed Attribute</a><br/>
+ <a href="velocity/testinsertdefinition_reversed_explicit.vm">Velocity: Test Insert Configured Definition with Reversed Explicit Attribute</a><br/>
+ <a href="velocity/testinsertdefinition_attribute_preparer.vm">Velocity: Test Insert Configured Definition with Attribute Preparer</a><br/>
+ <a href="velocity/testinsertnesteddefinition.vm">Velocity: Test Insert Nested Definition</a><br/>
+ <a href="velocity/testinsertnesteddefinition_tags.vm">Velocity: Test Insert Nested Definition only using JSP tags</a><br/>
+ <a href="velocity/testinsertnestedlistdefinition.vm">Velocity: Test Insert Nested List Definition</a><br/>
+ <a href="velocity/testinsertnestedlistdefinition_tags.vm">Velocity: Test Insert Nested List Definition only using JSP tags</a><br/>
+ <a href="velocity/testinsertdefinition_el.vm">Velocity: Test Insert Configured Definition with EL</a><br/>
+ <a href="velocity/testinsertdefinition_el_singleeval.vm">Velocity: Test Insert Configured Definition with EL to test Single Evaluation</a><br/>
+ <a href="velocity/testinsertdefinition_wildcard.vm">Velocity: Test Insert Configured Definition with Wildcards</a><br/>
+ <a href="velocity/testinsertdefinition_defaultvalues.vm">Velocity: Test Insert Configured Definition with Default Values</a><br/>
+ <a href="velocity/testput_cascaded.vm">Velocity: Test Put Tag with Cascaded Attributes</a><br/>
+ <a href="velocity/testput_cascaded_overridden.vm">Velocity: Test Put Tag with Overridden Cascaded Attributes</a><br/>
+ <a href="velocity/testput_cascaded_template.vm">Velocity: Test Put Tag with Cascaded Attributes and Template</a><br/>
+ <a href="velocity/testput_el_singleeval.vm">Velocity: Test Put Tag using EL to test Single Evaluation</a><br/>
+ <a href="velocity/testput_reversed.vm">Velocity: Test Put Tag with Reversed Attribute</a><br/>
+ <a href="velocity/testput_reversed_explicit.vm">Velocity: Test Put Tag with Reversed Explicit Attribute</a><br/>
+ <a href="velocity/testputlist_cascaded.vm">Velocity: Test Put List Cascaded Tag</a><br/>
+ <a href="velocity/testputlist_inherit.vm">Velocity: Test Put List Tag with Inherit</a><br/>
+ <a href="velocity/testimportattribute_inherit.vm">Velocity: Test importAttribute Tag with List Inherit</a><br/>
+ <a href="velocity/testsetcurrentcontainer.vm">Velocity: Test setCurrentContainer Tag</a><br/>
+
+ <h3>Mutable Container Tests</h3>
+ <a href="velocity/testdef_list_inherit.vm">Velocity: Test Definition Tag with a List Inherit</a><br/>
+
+ <h3>Database Verification tests</h3>
+ <a href="velocity/testinsertdefinition_db.vm">Velocity: Test Insert Configured Definition from DB</a><br/>
+ <a href="velocity/testinsertdefinition_extended_db.vm">Velocity: Test Insert Extended Configured Definition from DB</a><br/>
+
</html>
\ No newline at end of file
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp Tue Mar 10 23:24:21 2009
@@ -27,7 +27,7 @@
<tiles:destroyContainer/>
<tiles:initContainer containerFactory="org.apache.tiles.factory.TilesContainerFactory">
<tiles:putAttribute name="definitions-config"
- value="/WEB-INF/tiles-defs.xml,/WEB-INF/freemarker/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml,/org/apache/tiles/freemarker-classpath-defs.xml,/WEB-INF/tiles-defs-1.1.xml,/WEB-INF/freemarker/tiles-defs-1.1.xml"/>
+ value="/WEB-INF/tiles-defs.xml,/WEB-INF/freemarker/tiles-defs.xml,/WEB-INF/velocity/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml,/org/apache/tiles/freemarker-classpath-defs.xml,/org/apache/tiles/velocity-classpath-defs.xml,/WEB-INF/tiles-defs-1.1.xml,/WEB-INF/freemarker/tiles-defs-1.1.xml,/WEB-INF/velocity/tiles-defs-1.1.xml"/>
<tiles:putAttribute name="org.apache.tiles.context.AbstractTilesApplicationContextFactory"
value="org.apache.tiles.context.enhanced.EnhancedTilesApplicationContextFactory"/>
<tiles:putAttribute name="org.apache.tiles.factory.TilesContainerFactory.MUTABLE"
@@ -41,7 +41,7 @@
<tiles:putAttribute name="org.apache.tiles.evaluator.el.ExpressionFactoryFactory"
value="org.apache.tiles.test.evaluator.el.MultiversionExpressionFactoryFactory"/>
<tiles:putAttribute name="org.apache.tiles.context.ChainedTilesRequestContextFactory.FACTORY_CLASS_NAMES"
- value="org.apache.tiles.servlet.context.ServletTilesRequestContextFactory,org.apache.tiles.jsp.context.JspTilesRequestContextFactory,org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory"/>
+ value="org.apache.tiles.servlet.context.ServletTilesRequestContextFactory,org.apache.tiles.jsp.context.JspTilesRequestContextFactory,org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory,org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory"/>
</tiles:initContainer>
<tiles:insertDefinition name="test.definition" />
Modified: tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html?rev=752303&r1=752302&r2=752303&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Tue Mar 10 23:24:21 2009
@@ -420,6 +420,198 @@
<tr>
<td><a href="freemarker/ConfiguredDefinitionExtendedDbTest.html">FreeMarker: Configured Definition Extended Db Test</a></td>
</tr>
+ <tr>
+ <td><a href="velocity/WelcomePageTest.html">Velocity: Welcome Page Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionTest.html">Velocity: Configured Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionIgnoreTest.html">Velocity: Configured Definition with Ignore Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionFlushTest.html">Velocity: Configured Definition with Flush Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionWithPreparerTest.html">Velocity: Configured Definition with Preparer Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html">Velocity: Configured Definition with Configured Preparer Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionFromClasspathTest.html">Velocity: Configured Definition from Classpath Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionOverrideTest.html">Velocity: Configured Definition with Overridden Content Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionOverrideTemplateTest.html">Velocity: Configured Definition with Overridden Template Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionOverrideAndNotTest.html">Velocity: Configured Definition with Overridden and Original Content Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionInlineTest.html">Velocity: Configured Definition with Inline Content Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredCompositeDefinitionTest.html">Velocity: Configured Composite Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionExceptionTest.html">Velocity: Configured Definition with Exception Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionOldFormatTest.html">Velocity: Configured Definition Old Format Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionCascadedTest.html">Velocity: Configured Definition Cascaded Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionCascadedOverriddenTest.html">Velocity: Configured Definition Cascaded Overridden Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionCascadedTemplateTest.html">Velocity: Configured Definition Cascaded Template Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionCascadedListTest.html">Velocity: Configured Definition Cascaded List Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionReversedTest.html">Velocity: Configured Definition Reversed Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionReversedExplicitTest.html">Velocity: Configured Definition Reversed Explicit Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionAttributePreparerTest.html">Velocity: Configured Definition Attribute Preparer Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredNestedDefinitionTest.html">Velocity: Configured Nested Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredNestedListDefinitionTest.html">Velocity: Configured Nested List Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionELTest.html">Velocity: Configured Definition EL Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionELSingleEvalTest.html">Velocity: Configured Definition EL with Single Evaluation Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionOpenBodyTest.html">Velocity: Configured Definition with Open Body Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionDefaultValuesTest.html">Velocity: Configured Definition with Default Values Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionWildcardTest.html">Velocity: Configured Definition Wildcard Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagTest.html">Velocity: Put Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagFlushTest.html">Velocity: Put Tag with Flush Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagWithELTest.html">Velocity: Put Tag using EL Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagWithELSingleEvalTest.html">Velocity: Put Tag using EL with Single Evaluation Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagWithServletTest.html">Velocity: Put Tag with Servlet as Template Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagCascadedTest.html">Velocity: Put Tag Cascaded Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagCascadedOverriddenTest.html">Velocity: Put Tag Cascaded Overridden Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagCascadedTemplateTest.html">Velocity: Put Tag Cascaded Template Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagReversedTest.html">Velocity: Put Tag Reversed Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagReversedExplicitTest.html">Velocity: Put Tag Reversed Explicit Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagNestedDefinitionTest.html">Velocity: Put Tag with Nested Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutTagNestedListDefinitionTest.html">Velocity: Put Tag with Nested List Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutListTagTest.html">Velocity: Put List Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutListCascadedTagTest.html">Velocity: Put List Cascaded Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/PutListTagInheritTest.html">Velocity: Put List Tag Inherit Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/LocalizationTest.html">Velocity: Localization Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ImportAttributeTagTest.html">Velocity: Import Attribute Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ImportAttributeTagAllTest.html">Velocity: Import Attribute Tag with no Name Specified Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ImportAttributeTagInheritTest.html">Velocity: Import Attribute Tag Inherit Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/TilesDefinitionFilterTest.html">Velocity: Tiles Definition Filter Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/TilesDispatchServletTest.html">Velocity: Tiles Dispatch Servlet Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/SetCurrentContainerTagTest.html">Velocity: setCurrentContainer Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/DefinitionTagTest.html">Velocity: Definition Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/DefinitionTagExtendTest.html">Velocity: Definition Tag Extend Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/DefinitionTagListInheritTest.html">Velocity: Definition Tag List Inherit Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/DefinitionTagPreparerTest.html">Velocity: Definition Tag with Preparer Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html">Velocity: Composite Definition with inner Configured Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/CompositeDefinitionWithInnerDefinitionTest.html">Velocity: Composite Definition with inner Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html">Velocity: Composite Definition with inner Configured Definition with no Type Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html">Velocity: Composite Definition with inner Definition with no Type Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionRoleTest.html">Velocity: Configured Definition Role Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionRoleTagTest.html">Velocity: Configured Definition Role Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionAttributeRolesTest.html">Velocity: Configured Definition Attribute Roles Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionAttributeRolesTagsTest.html">Velocity: Configured Definition Attribute Roles Tags Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionDbTest.html">Velocity: Configured Definition Db Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="velocity/ConfiguredDefinitionExtendedDbTest.html">Velocity: Configured Definition Extended Db Test</a></td>
+ </tr>
</table>
</body>
</html>
\ No newline at end of file
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>
Copied: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html (from r751891, tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html?p2=tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html&p1=tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html&r1=751891&r2=752303&rev=752303&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html Tue Mar 10 23:24:21 2009
@@ -32,7 +32,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/tiles-test-sandbox/index.jsp</td>
+ <td>/tiles-test/index.jsp</td>
<td></td>
</tr>
<tr>